On 2020-11-17, at 8:35 AM, Tassilo Horn <t...@gnu.org> wrote:
> Hi all, > > in some project with a quite large codebase and several independent > teams working on it, the following situation occurs every once in a > while: > > 1. Some developer is analyzing and fixing some bug reported to the > team. Thereby, he finds some file XXX involved in the scenario > which clearly needs some refactoring, and so he does, because he'll > execute that part of the code many times anyway and add/improve the > tests, so now's a good chance to do that. > > 2. Some other team has some feature branch where the file XXX is also > heavily changed. Now a team member merges from the branch where > the refactoring took place and now has many hours of joy solving > conflicts. If you are looking at this AFTER it happens, and want to get help in fixing the merge, my best recommendation is imerge. Basically, instead of having to solve a single big huge difficult mess, you solve lots of tiny easy messes. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/885CE04F-6273-48A0-BAB5-AC8303E834EC%40gmail.com.
