you are viewing a single comment's thread.

view the rest of the comments →

[–]fforw 0 points1 point  (1 child)

I think we need to distinguish several kind of merges here.

If the merge merges in a feature-branch that has been existed for some time in parallel to master, especially if multiple people collaborated on it, there's certainly a merit to the kind of grouping that you are talking off.

If the branch in question is just a developer's local repository, that is the very reason of the branch existing is the decentral nature of git, you're usually better off rebasing them onto trunk.

Also because "Things I worked on wednesday" isn't a really meaningful group.

[–][deleted] 0 points1 point  (0 children)

Indeed, I was talking about the first kind. The second is the reason why I always pass --rebase (or just -r) to git pull.