Question

1. How can I differentiate between two
   local branches in git ?
2. How can I copy one local branch to another local branch ?

In general how can I perform difference operation between two local branches on my server using git. I tried looking it up online but there is not enough documentation on that or there is not clear documentation on that.

Any suggestions or links to useful material would be highly appreciated.

Thanks.

Answer 1

git diff and git merge

Say you have two branches: master and dev

o-o-o-o-o-o-o-o-o   master
           \
            o-o-o   dev

and you’re on dev

git diff master

will show you the difference between the content of dev and the content of master

git merge master

will merge the changes from master into dev, and your history will look like this:

o-o-o-o-o-o-o-o-o   master
           \     \
            o-o-o-o   dev