Therefore, this state/version is often also called "mine". This is your file as it existed in your working tree before you started the merge (i.e., the file conforms to the latest committed state of the HEAD of your local repository) - that is, without conflict markers. This is the common ancestor's version of the conflicted file (this version does contain neither any of your nor any of the changes of the to be merged branch/revision, especially it does not contain any conflict markers). Then TortoiseGit will place three additional files in your directory for the selected conflicted file and launch the configured conflict editor: You can use any editor to manually resolve the conflict or you can launch an external merge tool/conflict editor with TortoiseGit → Edit Conflicts. the section called “HOW CONFLICTS ARE PRESENTED”): The conflicting area is marked in the file like this (also cf. Whenever a conflict is reported you need to resolve it! When both sides made changes to the same area, however, Git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area.
![how to use tes5edit to remove conflicts how to use tes5edit to remove conflicts](https://i.imgur.com/nAlx1r9.png)
Once in a while, you will get a conflict when you merge another branch, cherry-pick commits, rebase or apply a stash: Among the changes made to the common ancestor's version, non-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the final result verbatim. During a merge, the working tree files are updated to reflect the result of the merge.