Git Help - Sync my repo (frappe fork) to latest frappe repo

  1. I forked manual_erpnext_com.
  2. Got app from my repo instead of frappe repo ‘‘bench get-app manual_erpnext_com https://github.com/revant/manual_erpnext_com’’
  3. Installed it on local bench site as described in readme.
  4. Made changes and commit
  5. Sent pull request
  6. Got merged

Now after some time my repo (revant/manual_erpnext_com) shows it is behind by some commits

How do I sync my repo to latest frappe/manual_erpnext_com?
Tried reading online about git couldn’t understand.

Hello,

Go to manual_erpnext_com, and pull updates using git pull https://github.com/frappe/manual_erpnext_com.git master

[recomeded way]

set upstream to https://github.com/frappe/manual_erpnext_com.git
set origin to https://github.com/revant/manual_erpnext_com

Before pushing to origin,
1. pull updates from upstream
2. resolve conflicts & recommit
3. push to origin & send pull req

Regards,
New Indictrans Technologies Pvt. Ltd.

1 Like

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