Summarizing
git remote add upstream https://github.com/frappe/manual_erpnext_com.git
git pull --rebase upstream master
If you find conflicts, then resolve them in the file and then
git add .
git rebase --continue
1 Like