Recently I had to merge a git repository into my own fork of this repository.

Since this is a little tricky I decided to post this here:

First you have to add the parent repository as a remote repository of your fork.

1
git remote add <alias> <url>

Then pull the changes with the –rebase option which prevents git from creating a commit for the merge.

1
git pull --rebase <alias> <branch>

In case of conflicts:

Use this to find them:

1
git diff

Open the appropriate file and search for ‘<<<’ to find the lines to fix.

Run this to mark fixed conflict files as resolved:

1
git add <file>

Then complete the rebase with:

1
git rebase --continue

Hope this helps,
visit