diff --git a/Agri-farm-ERPNext-PR-git-primer.md b/Agri-farm-ERPNext-PR-git-primer.md index e8f3764..3af4824 100644 --- a/Agri-farm-ERPNext-PR-git-primer.md +++ b/Agri-farm-ERPNext-PR-git-primer.md @@ -1,6 +1,11 @@ -#### These are the steps you should follow +#### Steps to setup development environment and contributing changes to the agri-farm-erpnext branch. + +## Fork erpnext to your user or organziation repository 1. fork erpnext + +## On your development machine (virtualbox linux, for example) + 2. ```git config -e``` 3. This opens the .git/config file 4. Make sure your remote upstream fetch configs look something like this (by default get-app fetches only the develop branch) @@ -21,4 +26,10 @@ git checkout -b origin_agri --track origin/agri-farm-erpnext ``` 8. Do a ```git branch -vv``` 9. Your current branch should be origin_agri -10. Make your changes on this local branch + ```git add``` + ```git commit``` + ```git push origin HEAD:agri-farm-erpnext``` + Pull Req !! \ No newline at end of file +10. Make your changes on this local branch + ```git add``` + ```git commit``` + ```git push origin HEAD:agri-farm-erpnext``` + +## Make a pull Request !! +1. On the repository where you want your changes to be pulled (frappe/erpnext) select the desired branch +2. Select the agri-farm-erpnext branch +3. Click on **New Pull Request** +4. Follow instructions! \ No newline at end of file