What exactly does git rebase -skip do?

Question

I just did git pull --rebase origin master and there was a conflict.

Firstly, this conflict was in a file that I did not touch, and was about 10 commits ago. Why is this happening?

Then I accidentally typed git rebase --skip and it “skipped this patch”.

Worried that I missed the commit, I checked the new version of the master branch and made the difference between the branch in which I did rebase and the new main branch. The only changes that appear in diff are the last commit and view the log, the patch that was "skipped" is displayed in the commit history.

Can someone explain what is going on here?

Answer 1

He does what he says, he misses the fix. If you run rebase --abort in a later conflict during the same redirect, the missed commit will also be undone, of course.

If your change already existed up, Git will not be able to apply your commit (but usually you should skip it automatically if the patch is exactly the same). Your own commit will be skipped, but the change will still exist in the current HEAD because it has already been applied upstream.

You really need to make sure that you have not deleted important changes;) (use reflog to return to the state before reinstalling)