awesome-python-resources icon indicating copy to clipboard operation
awesome-python-resources copied to clipboard

Unpleasant commit history

Open reganto opened this issue 2 years ago • 8 comments

Hi, I realized that git history is a little bit dirty

dirty log

suggestions:

  • I think we should add "coercion to rebase" before any PR in CONTRIBUTING.md
  • ~Squash and merge~

Best Regards Reganto

reganto avatar May 20 '22 15:05 reganto

Hi, Could you please clean the git history dear @reganto?

bobycloud avatar Aug 03 '22 12:08 bobycloud

Hi dear @bobycloud

There is an interactive rebase solution for this situation but with that solution we lose a lot of commits. I'm curious to know if you have any experience of cleaning up git history without losing commits?

reganto avatar Aug 05 '22 15:08 reganto

@reganto , If the commits are redundant and useless, Losing them won't hurt anyone. I believe it might actually benefit us too.

SepehrRasouli avatar Aug 06 '22 07:08 SepehrRasouli

Dear @SepehrRasouli

Honestly, I don't have a clear idea about this. But I can think of people who made their first open source contribution to this repository. They might later want to refer to their first contribution, and if we consider their PR as their signature, I don't think it would be ethical to erase that signature.

reganto avatar Aug 06 '22 13:08 reganto

Your reasoning is very ethical and I completely understand it. But, I think squashing their commits won't hurt them, Because we're not squashing their commits with others, For example, In the picture you've attached, Look at the three last commits made by @smoeinbbp, Squashing them together won't remove them from contributors list or hurt what they've done. But still, Squashing these commits might be an unethical idea. I think we should have a CONTRIBUTING.md file to tell new contributors the correct conventions for commiting their changes. This will prevent more dirtiness in the future. What do you think about it @lnxpy @bobycloud ?

SepehrRasouli avatar Aug 07 '22 07:08 SepehrRasouli