easy way to mearge – git mergetool – github: This branch has conflicts that must be resolved Use the command line

by | May 29, 2016 | General | 0 comments

easy way to mearge – git mergetool – github: This branch has conflicts that must be resolved Use the command line
  1. install git: https://git-scm.com/downloads
    1. important to select “checkout as-is, commit as-is”
    2. use only git from windows command line no other Unix tools, usually a good selection
    3. select: git bash from here , git GUI from here .
  2. install kdiff3 http://kdiff3.sourceforge.net/
  3. kdiff3 with git integration
    1. edit C:\Users\user\.gitconfig
    2. put there:
      [diff]
    tool = kdiff3
 
[merge]
    tool = kdiff3
 
[mergetool "kdiff3"]
    path = c:/Program Files/KDiff3/kdiff3.exe
    keepBackup = false
    trustExitCode = false
 
[difftool "kdiff3"]
    path = c:/Program Files/KDiff3/kdiff3.exe
    keepBackup = false
    trustExitCode = false
    3. to use the merge tool, you type “git mergetool” or from git GUI right click on the code and choose mergetool
  4. when you get a conflict you simply type git mergetool
  5. how to use kdiff3?
    1. in the toolbar, there are up/down double arrows that skip merge conflicts.
    2. the left column(A) is the common ancestor. then you choose from toolbar which version you want column B version or C version,
    3. after all of the conflicts are resolved it is possible to click in the toolbar save and exit.
  6. how to solve the Github merge conflict?
    1. clone with ssh
    2. go to the pull request with the conflict
    3. enter the cloned repository
    4. use the first part of git commands that offered by Github to resolve the conflict using the command line
    5. use mergetool and commit
    6. use the second part of git commands that offered by Github to resolve the conflict using the command line

 

Submit a Comment

Your email address will not be published. Required fields are marked *