Pulling changes from a separate branch using Git and Netbeans
I am using Netbeans, and I have a Git branch that I am working on where I am doing some radical changes to our software. My team is pushing their changes to a separate branch.
Is there an easy way for me to pull changes from my team branch and merge them into a separate branch without affecting my team branch?
I want to do this so that I can continually check my sweeping changes with the latest changes on my team to make sure they are compatible.
source to share
If you are the only one using your branch (or if you haven't pushed your branch yet), it is good practice to rebase your branch at the top of your command branch .
git checkout yourBranch
git fetch
git rebase origin/teamBranch
This way you re-release your commits on top of the updated team and you can check if your code works.
Also, once you push your branch, it will easily merge into the team branch (fast forward).
NetBeans with Git supports rebase .
source to share