Answer the question
In order to leave comments, you need to log in
How to rollback rm generated by merge in git?
The task is educational, I experiment.
1. First commit, created 3 files:
file1, file2, file3
2. Created a branch, made rm on file1 and file3 in it, left file2
3. Made rm on file2 and file3 in the master, left file1.
4. Made merge branches to the master. Received file2 in the master, file1 was deleted
5. Decided to roll back the last merge: git reset HEAD~1, got:
$ git reset HEAD~1
Unstaged changes after reset:
D task1.js
Answer the question
In order to leave comments, you need to log in
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question