I am getting this message:

 First, rewinding head to replay your work on top of it...

each time I do a git pull --rebase origin <branch>, however I would like to discard all my work that may be replayed on top of it.. Basically I would like to rebase only the origin branch without my work on top of it. How can I clean those commits that comes up wrongly all times I try to pull rebase? Again, my goal is just pull rebase the exact snapshot of the origin branch without my work on top of it.

有帮助吗?

解决方案

git fetch origin; git reset --hard origin/<branch>

其他提示

I have 3 branchs:main,feat-dev,func。(feat-dev from main,func from feat-dev)

I use these step:

  1. on func, git rebase origin/feat-dev; git push --force;
  2. on feat-dev, git rebase origin/main; git push --force;
  3. on func, git rebase origin/feat-dev.

git tell me same messages: "First, rewinding head to replay your work on top of it..."

On func, I just use

git push --force

Then everything goes fine.

许可以下: CC-BY-SA归因
不隶属于 StackOverflow
scroll top