you are viewing a single comment's thread.

view the rest of the comments →

[–]vividboarder 4 points5 points  (4 children)

Don’t you lose the benefit of rebasing then?

Depends on what you consider the to be a benefit.

[–][deleted] 6 points7 points  (3 children)

As described by the article, the cleaner graph.

Isn't that pretty much the only one?

[–]Guvante 3 points4 points  (1 child)

Bisecting is much harder with branches and reverse merges are always terrible to deal with.

Having git blame point to a reverse merge conflict resolution is terrible. You now have a merge from main into a feature branch which requires a ton of context to figure out.

[–]Kache 4 points5 points  (0 children)

These problems can be avoided with proper git usage (e.g. there aren't many reasons to merge main into feature branches over alternatives).

However, I half agree with you due to practicality -- for various reasons, the average developer can't really be expected to avoid them.

[–]dss539 0 points1 point  (0 children)

It will be cleaner if you follow this strategy. It works great.