Return to Answer

For me the following worked:

(1) First fetch all changes:

$ git fetch --all 

(2) Then reset the master:

$ git reset --hard origin/master 

Note - For users of github, "master" was replaced with "main" in October 2020. For projects created since then you may need to use "main" instead, like:

$ git reset --hard origin/main 

(3) Pull/update:

$ git pull 

For me the following worked:

1. First fetch all changes:

   $ git fetch --all 

2. Then reset the master:

   $ git reset --hard origin/master 

   Note - For users of github, "master" was replaced with "main" in October 2020. For projects created since then you may need to use "main" instead, like:

   $ git reset --hard origin/main 

3. Pull/update:

   $ git pull 

For me the following worked:

(1) First fetch all changes:

$ git fetch --all 

(2) Then reset the master:

$ git reset --hard origin/master 

(3) Pull/update:

$ git pull 

For me the following worked:

(1) First fetch all changes:

$ git fetch --all 

(2) Then reset the master:

$ git reset --hard origin/master 

Note - For users of github, "master" was replaced with "main" in October 2020. For projects created since then you may need to use "main" instead, like:

$ git reset --hard origin/main 

(3) Pull/update:

$ git pull 

For me the following worked:

git fetch --all # fetch all changes git reset --hard origin/master # reset the master git pull # pull/update 

For me the following worked:

(1) First fetch all changes:

$ git fetch --all 

(2) Then reset the master:

$ git reset --hard origin/master 

(3) Pull/update:

$ git pull