Merge parent repository into fork without leaving traces
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.
git remote add <alias> <url>
Then pull the changes with the –rebase option which prevents git from creating a commit for the merge.
git pull --rebase <alias> <branch>
In case of conflicts:
Use this to find them:
Open the appropriate file and search for ‘<<<’ to find the lines to fix.
Run this to mark fixed conflict files as resolved:
git add <file>
Then complete the rebase with:
git rebase --continue
Hope this helps,