Merge Parallel Fork

Jump to bottom Edit New page

gtzelepis edited this page Dec 15, 2014 · 8 revisions

Prepare your branch

git commit -m'commit message' any working directory changes or git stash if you intend to apply them after the merge. (this is necessary if you don't want to lose working directory changes in step 2)
git checkout <branchname> (eg. git checkout develop) for the branch you intend to merge into.
git status to check everything is ok.

Add a friendly name remote to the branch you intend to pull from

git remote add <friendlyname> <git url> (eg. git remote add ioannisstenos https://github.com/ioannisstenos/e-science.git)
git fetch <friendlyname>
git merge <friendlyname>/branch (eg. git merge ioannisstenos/develop)
git push if needed to update your origin.

Using a visual diff / merge tool to resolve conflicts

sudo apt-get install meld
git config --global diff.tool meld
git config --global difftool.prompt false
git config --global merge.tool meld
git config --global mergetool.prompt false
git config --global mergetool.keepBackup false

git difftool | git mergetool