I lose my commit when changes origin branch locally

Asked Aug 20 '20 at 04:19

Active Aug 20 '20 at 04:35

Viewed 26 times

1

My operation is :

git pull
git checkout origin/a
changes some code
git add.
git commit -m "fix: save my changes"
git checkout b
git checkout origin/a

and I found my changes disappeared.

asked Aug 20 '20 at 04:19

Zhenchuan Ren

29
3

1 Answers1

1

When you checkout (using git switch by the way) origin/a, you are in detached head mode.

You should:

git switch a to create a local branch a linked to origin/a
git branch -avv to check a exists, and has origin/a as upstream
git reflog to find the commit you have done
git cherry-pick <sha1> to get that commit on your branch a

answered Aug 20 '20 at 04:35

VonC

1,262,500
529
4,410
5,250

@ZhenchuanRen Great! Don't forget to read https://stackoverflow.com/users/6309/vonc?tab=answers – VonC Aug 20 '20 at 05:47