3 ms·
When I work together with people on projects, I make them to agree that nobody other than the author of commits is allowed to resolve merge conflicts, and confl
by rndgermandude 7y ago
When I work together with people on projects, I make them to agree that nobody other than the author of commits is allowed to resolve merge conflicts, and conflicts must be resolved in the feature/pr branch that is going to be merged into the main branch(es)