To your first concern, you're right that our current design doesn't make it easy for you to view specific changes (outside of what files have been modified) before you pull them. Person's 1 change is just gone and no conflict was ever raised.Ĭlick to expand.I understand. Its almost as if it only wanted to compare with the original change only and not future changesĢa) Both people edited a for loop in the same file (this is immediatly after that first test scenario)Ģb) Person 1 changed the for loop to be from i=0 to i=1Ģc) Person 2 changed the for loop to be from i=0 to i=4Īt this point there was no conflict and the value in the file was i=4
#Best mac visual diff tool update#
These changes are going to be called A (person 1) and B (person 2)ġc) Person 2 saw the publish and did an update creating a conflictġd) Person 2 resolved the conflict and put a new comment into the code to show it was resolvedġe) Person 1 made another change in the same placeġf) Person 2 (who has not done any publishing at this point) sees this new change and does an updateġg) Person 2 sees a conflict but instead of the conflict being between his resolution of the first conflict, and the new change, its between the original B change and the new change. 2 more things I found while evaluating conflicts between 2 peopleġa) Both people touched a function in some file.
0 kommentar(er)
