Currently I am having erpnext version 7.0.33. Branch is master.
I have some personal customizations on top of 7.0.33. I wish to update to 7.1.0.beta.
When I pull develop branch and merge it to my local master branch, I get a lot of conflicts. How do I update to beta version?
Looking into differences of develop and master branch on erpnext git repository, I see that lot of develop commits are missing in the master branch. How are the changes moved from develop to master? (cherrypick or merge or …)
There is a income tax calculation feature which is only present on develop (BETA) right now. I want to pick this feature from remote develop to my local master.
You mean I should maintain two branches. But eventually I’ll have to merge the new features into my app. How does maintaining two apps save me from conflicts?
And here currently I want to pick some features from develop branch into my local master branch. If I know the process how the changes are migrated from develop branch to master branch, then I can do the same and get the new feature.
When doing customizations, you want to do them in a separate app. That will allow you to install them on other machines, and allow you to keep on the most up-to-date version of erpnext and frappe.
If you want to switch between develop and master, use the following bench command:
bench switch-to-develop
This will only work if there are no conflicts due to customizations you made.
Hello @netchampfaris
If I need to contribute, then I have to create develop branch that track remote develop branch?
If I did this with master branch then my pull request will be refused to be merged?
Regards
Bilal