I was working in production master branch (and the version was 11, but the branch is master), I was need to do some customization, so I created a branch for me and I did customization under this branch. And I was able to do upgrade for master branch and then merging to my branch. My branch pushed to my github repository (which was forged from erpnext project).
Now erpnext is using branch version-11 for production, what is the best way to pull my branch from my repository without having problems for a fresh installation?
Actually I need to be able to pull my branch and I need also to be able to merge version-11 into my own branch. So how I can do this?
Note: last modification for my branch was in July (and my branch was build based on master branch which is no more existed).