0

My teammates use VS Code. Very often when there is a conflict and they pull, they fix some conflicts manually, but it seems that some conflicts resolve themselves which leads to very very big problems with the code.

How is this possible ? Often I see large sections of deleted code in the commit histories, which they claim they did not delete manually.

Is there any setting in VS Code which may cause this ? I really need to resolve this.

Angel Miladinov
  • 1,596
  • 4
  • 20
  • 43
  • I think the bigger problem is that you say "Often *I* see..." As if they don't see it too. Maybe they need to be taught how to spot and check for errors they are making. – TTT Mar 02 '21 at 06:01

1 Answers1

2

It happens sometimes that git successfully merge text changes without conflicts that makes no sense at the lexical level.

But it should not be the problem here because your teammate says it has not deleted the lines and you explicitly (?) says that there are conflicts.

Once git detect conflicts, it launches an editor, here VS Code letting the user fixes the conflicts with this UI:

enter image description here

So the user has to do an action. And if the user save without doing the choice (I don't remember if that's possible in VSCode), I don't think you end up with parts of files delete without the user specifically delete it within VSCode or in a commit merged.

So, even if I can't be sure without seeing the file content and diffs, for me it's a mistake from the teammate where he did something without noticing it.

The better solution is to replay the merge with him to understand what he does because you should still have the commits in the repository.

Do:

  1. Create a branch at the good place (before you added your commit and he did also)
  2. Push the branch and he pull it.
  3. He reset to the commit before the merge (using the reflog or not)
  4. Push your new commit
  5. He pull and you solve the conflicts together and you try to understand.
Philippe
  • 28,207
  • 6
  • 54
  • 78
  • I agree this is ultimately a training issue. (It's possible, but unlikely, that the problem is an evil auto merge.) Having them walk you through what they did is the best way to show them where they went wrong. And if it is an evil merge, then showing them how to spot it is also important. – TTT Mar 02 '21 at 06:05