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.
So the (rhetorical) question is: could the developer in step 1 have
known beforehand that his changes are going to cause such troubles so
that instead of doing a major refactoring he would just do the most
minimal change fixing the bug?
I guess, the question is "yes" because the required information is there
for sure. So the practical question is more like "has somebody written
a script/tool" which helps answering that question?
Or formulated in a more concrete question: Is there a branch which
a) hasn't been merged into the current branch yet,
b) has a common predecessor with the current branch,
c) changed file XXX in a significant way (expressed maybe as a ratio of
changed lines when diffing that file on the other branch and the
current one and the number of lines in the file).
Bye,
Tassilo
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/git-users/87eekseyal.fsf%40gnu.org.
