title: How to update local branch with changes from remote git branch without having to 'merge' commit
body: <p>I have a remote branch where I have pushed some changes from <strong>PC A</strong> (I am the only one working on this branch). I also have <strong>PC B</strong> where the same branch is cloned (is tracking the same remote branch as from <strong>PC A</strong>), but it is missing the latest changes that I just pushed to the branch from <strong>PC A</strong>. When I run <code>git pull</code> on <strong>PC B</strong> to get the latest changes, git obviously complains about 'merge conflicts'. Since I am tracking the same remote branch from <strong>PC A</strong> and from <strong>PC B</strong>, I <em>do not</em> want to make a merge commit every time and I also do not want to rebase. I just want the branch on <strong>PC B</strong> to get updated to the exact state as the remote branch without having to make any commits whatsoever. How can this be achieved in git?</p>