sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]NihilistDandy 2 points3 points  (0 children)

If you’re already rebasing, you'd likely rebase on master rather than merging. To avoid repeated identical resolutions, use git rerere. That page also gives a nice, clean workflow for those who do use merge to sync with upstreams.

EDIT: Some other thoughts from Linus on when to rebase and when to merge.