![]() When there are overlaps, however, these operations record the three versions for each conflicted file in the index, and you will see changes from both our side and their side in the file in your work tree, marked with conflict markers, to resolve manually. The merge results are already recorded in the index, and are waiting for you to make a commit out of them. If there is no overlap between our changes (since base) and their changes (again, since base), the merge is automatically resolved cleanly, and you don't have to deal with manual resolution. the version the changes to be replayed is taken from). the version to which the changes from the other side is replayed), and their version (i.e. Three versions of files are involved: the base version, our version (i.e. Our task is to replay the change one side made on top of the state of the other side. ![]() These mergy operations are handled exactly in the same way in all of these situations.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |