4 ms·
In fact there is never a way around merging, unless there is never parallel development. Even after rebasing, a merge has to happen since the changeset of a fe
by nuancebydefault 3y ago
In fact there is never a way around merging, unless there is never parallel development.
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.
To me banning merge commits does not solve the merge problem.