GITKRAKEN MERGE TOOL HOW TO

Without syncing, make a change to the same document using the text editor locally: Let’s edit this file and line with a single # as an H1 tag:ĭon’t forget commit this change on the website. The first title line isn’t properly formatted. Let’s add a change to our remote repository to main documentation README.md file.

GITKRAKEN MERGE TOOL HOW TO

But if these changes conflict with one another – if you try and change the same line of the document in two different ways – that’s when there is an issue, as Git will not know which change is the one you wish to keep.Īn example will help illustrate the most likely way conflicts can emerge, and how to deal with them. If you make changes in different parts of a file or within the repo, these changes can be merged (synced) together without any conflict. The most likely way a conflict will emerge is if you, or if you are sharing your repo with a collaborator, make a change on either the local or online repo, and then make a subsequent change on the other without first syncing the changes.

If you are careful about committing and syncing then it is unlikely you will run into this issue but if you do, it can be resolved fairly easily. Managing Conflicts | Introduction to Version Control (GitKraken/Github) Introduction to Version Control (GitKraken/Github) GitKraken lesson (forked from HBS-RCS) View on GitHubĪ conflict emerges when you try to merge (sync) two versions of a document with changes which conflict with each other.

Gitkraken merge tool