Git pull origin overwrites master?

If you do a git pull with a remote branch name, it will fetch the remote branch and then merge it into your current local branch. So to undo that, you will first have to reset your local branch to the remote master, then create a new local vs12up branch from the corresponding remote branch.

  1. Reset your local master to match the remote repository’s master (WARNING: be sure that you don’t have any uncommitted changes you want to keep before issuing the following command):git reset --hard origin/master
  2. Fetch all remote branches into your local repository:git fetch origin
  3. Create a new local vsup12 branch from the remote vsup12 branch, and switch to this new local branch:git checkout -b vsup12 origin/vsup12

Note that when you subsequently just do a git pull while switched to the vsup12 branch, you’ll fetch and merge the latest changes from the vsup12 branch on Github into your local vsup12

Leave a Comment