Please do following set of commands in order to merge with the master, Assuming that you are in branch testBranch and you want to merge the changes with the master, First checkout to master branch, git checkout master Now pull the latest changes in master, git pull origin master Merge with the testBranch git merge … Read more
You could use complete unix paths like: PATH=$PATH:/c/python26 git config –global merge.tool meld git config –global mergetool.meld.path /c/Program files (x86)/meld/bin/meld This is what is described in “How to get meld working with git on Windows” Or you can adopt the wrapper approach described in “Use Meld with Git on Windows” # set up Meld as … Read more
You mean this? git checkout destination_branch git merge tag_name