You can resolve this, while you have master checked out, by typing: git merge origin/master. It's possible though that your copy of the remote branch ...
確定! 回上一頁