I have a PHP project on a git server and I am working on local and there is a clone of it on the main server that my site is run on it.
I have two branches :
1.master
2.server
Now my question is:
How to make some changes on master and only merge some changes (not all) on the ‘server’ branch ?
Thanks in advance!
Use
for every commit you want to get from the other branch.
You can get the commit-Id from the output of
See http://www.kernel.org/pub/software/scm/git/docs/git-cherry-pick.html for more information.