3 ms·

What is the problem with the graph in the first figure? Apart from looking a little bit more complicated than one without the merges, will a history like that

• barrkel 7y ago
  There aren't any problems. If anything, it's a more honest reflection of history, whereas rebase will erase past current state and remove your ability to wind backwards to the way the world actually was. If you view a neat ahistorical history as a primary artifact of development, then you need rebase.
• dahart 7y ago
  Nothing wrong with the first graph. Avoiding history noise is a minor concern. Perhaps a more practical reason to use control merges without pushing them into the branch is to keep the branch completely stable, allow everyone in the branch to test their own work without being affected by churn in master. Then the integration testing can all happen right before merging back into master. That’s a choice though, it’s equally valid and sometimes desirable to merge from master frequently, and keep the integration testing going, at the expense of some bumps for people in the branch.