New answers tagged legacy
0
votes
Resolving merge conflicts due to refactoring
At any point in time, there is a base line, you have code that is different from the base line, and merging changes the base line to include your changes.
Now if I had changes from the baseline myself,...
- 46k
0
votes
Resolving merge conflicts due to refactoring
Revisiting this - my experience is that merging refactoring work is only a problem when there is code motion, such as:
Extracting a superclass or interface.
Extracting a method or variable.
Moving a ...
Top 50 recent answers are included