
I use git in a small team and TortoiseGit as a client. On a daily basis, I find that my local branch is committed to a branch without any local changes.
My course of action is to start with a remote upgrade and follow from Switch / checkout to <remote branch>. If I already have the corresponding local branch, I need to check the Forceor checkbox Override branch if existsto continue.
Question: what is the difference between the two?
Further reading: I know that there are other possibilities, such as Pullor Reset branch to this. The procedure described above is simply my favorite for various reasons.
Pavel source
share