Git usage -- stay on a certain commit, but the code can always be updated to the last commit

GS (GIT status:

You are currently rebasing branch 'master' on '6ff7d77 '.

(All conflicts fixed: Run "Git rebase -- continue ")

When the current branch stays on the "6ff7d77" commit, a prompt is displayed after running git rebase-continue.

Error: ref refs/heads/master is at 30222e596f87fe0ec2e74a4fe152d91af495e489 but expected 1f48a9a53201ca92f03d32d12f5a5a456f9b893c

Fatal: cannot lock the ref 'refs/heads/Master '.

Cocould not move back to Refs/heads/Master

 

Run in sequence

Git Update-ref refs/heads/Master 1f48a9a53201ca92f03d32d12f5a5a456f9b893c

Rebase-continue

GS

Follow the GS prompts

(Here my prompt is: git pull)

Git usage -- stay on a certain commit, but the code can always be updated to the last commit