Now, we want to solve these conflicts with a graphical tool (in the example, it’s meld). > git merge branch1ĬONFLICT (content): Merge conflict in testĪutomatic merge failed fix conflicts and then commit the result. Let’s say we want to merge a branch, branch1, into master and this merge will have some merge conflicts. Now I’d like to demonstrate how to use git mergetool. It is used in instances when we have merge conflicts during a merge action.
0 Comments
Leave a Reply. |