There is a branch in stage A that mistakenly overwrites the file file.php, and then stage -> commit -> push has been updated to the remote (forming B).
View this file in stage A in smartGit, how to restore it to this stage, clicked Revert
Rebase HEAD
Rebase to HEAD
but it is still useless.
The second attempt is to right-click on the file file.php in stage A. There is Save After
Save Before
What is the difference between the two?
PHPz2017-05-02 09:32:07
What is mentioned aboveSelect whether to save the file state Before or After the selected commit
is to save the state before or after submission.
If I understand correctly, file.php was overwritten when you submitted A, so if you want to return to the state of file.php before submitting A, then it should be Save Before.
I guessed