Home
2 comments
dangover 1 year ago
Comments moved to <a href="https://news.ycombinator.com/item?id=38800454">https://news.ycombinator.com/item?id=38800454</a>.
nuancebydefaultover 1 year ago
In fact there is never a way around merging, unless there is never parallel development.<p>Even after rebasing, a merge has to happen since the changeset of a feature can in general not be blindly applied after its base has changed.<p>To me banning merge commits does not solve the merge problem.