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. Thanks in advance.
Note the “rewinding head to replay your work on top of it…”. It means that your commits are rebased onto current remote HEAD . If you want to merge a feature branch it might be wiser to actually merge your commits (thus having a single point of integration of two distinct branches).
I recommend to use git pull --rebase only if you know you forgot to push your commits before someone else does the same. If you did not commit anything, but your working space is not clean, just git stash before to git pull .
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:
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.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With