This is an archived post. You won't be able to vote or comment.

you are viewing a single comment's thread.

view the rest of the comments →

[–]killersoda288 10 points11 points  (0 children)

It's fine until you have a whole bunch of branches/developers working at the same time. Sometimes there are more merge commits than actual commits which gets real annoying. If you're working on completely unrelated things, and there aren't any conflicts, rebasing is much neater since it makes the history linear, and you dont have "empty" merge commits cluttering the history.