I have an application running in a git repository on a branch (say dev). The application modifies the content in some the repository and commits them. I now hav
dev
This works very well for me when wanting to merge two branches without having to checkout either of them:
git fetch . :
Other options are described here.