V
V
Vann Damm2021-08-01 20:57:06
git
Vann Damm, 2021-08-01 20:57:06

Git rebase --continue, revert file back to original?

The essence of the problem is this, there is a commit, for example 5 of 10, I need to change the file in it and commit it. My actions are git rebase -i HEAD~5, change the desired commit from pick to edit, save. I change the file I need. git add is my file path. Next, git rebase --continue, he writes that I have a file conflict, I deal with the conflict, I do git add my file path. Next, git rebase --continue, he again writes to me that I have a conflict, and so on ad infinitum

Answer the question

In order to leave comments, you need to log in

1 answer(s)
V
Vladimir, 2021-08-02
@Casufi

Why change the old committee then? What a perversion, make the changes a new commit.
Well, conflicts with your method are maximum for all subsequent commits, you just need patience to deal with such perversions.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question