search

robust-rosin / robust

A dataset of 200+ bugs in the Robot Operating System for BugZoo
30 stars 9 forks source link

Suggestion: please rebase instead of merge #64

Open gavanderhoorn opened 6 years ago

gavanderhoorn commented 6 years ago

The commit history shows a lot of "merged branch X of Y".

Could I sugges to use git rebase instead? Updates to bug descriptions and bugzoo manifests seem fairly orthogonal, so not maintaining the historical order of commits doesn't seem to important.

Rebasing keeps the history a bit saner imo.

wasowski commented 6 years ago

will try (less experience with rebasing here but no problem)

gavanderhoorn commented 6 years ago

Unless you've touched someone else's files, a git fetch && git rebase origin/master should not require any manual intervention. Then a git push should be clean, no merges needed.

wasowski commented 6 years ago

ok. Even if I forget, the merge commits will probably be more limited from me, as I am trying to work on branches per bug now. Mostly so that I have an easy way to hid things that are very unfinished. Then I should probably squash them when merging into master.

gavanderhoorn commented 6 years ago

Yes, branches are also fine. But before merging, you could still rebase, as that would make the merge of the branch a lot cleaner.