"C. Bergström": > Pretty please do NOT allow "merge" commits.. they are the bane of evil > for the long term ability to have any sane work-flow.
It works pretty well for the linux kernel. Ofc it's a matter of actually handling it. If people are unable to properly handle tools/methods, everything could become the bane of evil, no matter what tool you use. > There's a big debate between merge vs rebase I think most of those debates are nonsense. Both methods have their use cases. But it matters when to use them. A lot of people don't even know how to actually rebase, so they end up causing merge commits for everything which will lead to a _very_ confusing history. Simply banning that method is not a solution in my opinion. The solution is to make a clear policy or recommendations when to use one of them.
