say i have two branches: condor and master
Then I do some changes on master where I edited on my laptop, then apply these changes to the condor branch to get it run on condor.
so, first, you checkout on condor branch
git checkout condor
then you merge the master into the condor branch:
git merge master
git log --graph --decorate --oneline --all
after merging, the master branch still exist.