I am trying to return a defective merging, but the changes in both the commands are not correct.
In this way I have made a merge committ:
# Merge Master in the branch: GIT checkout branch GIT Merge Master # Code> Now I want to return the merge:
git log b2e command b2a ... merge: d9 ... cf4 .. GIT Revert-M1-NB2A
The problem is that the git status indicates that it will only remove the conflicts that I Had solved, and whole Do not merge. The git revert -m 2 -n b2e command will undo the changes made to the branch before the merge, which I do not want.
The second question is: How do I show that what was changed in the merge committe?
git show b2e # shows only the conflict I have been opposed to git diff b2e de9 # same git diff b2e cf4 # shows what is different between the branch and master < / Pre>
Update: de9 was correct to return the commit and git diff b2e de 9 was shown what was done. One of the reasons I was confused because there was no difference in the removal / dispute, so I thought that the changes were made, git was not showing me the difference from cf4 , master Committed, confused me even more because I did not quite know what was going on. There is no need to answer this question.
returning the guitar maybe what you want to do. Instead, the easiest way to go back to the previous visit was to run the git reset - hard HEAD ^ (or instead use SHA1 which you want to take back HEAD ^ ), especially if you are working on your own, or if you have not yet returned your merge and / or back if you use to return By withdrawing the merge, you can come to the state in which you return The commands that are done can not be easily reissued, are recorded as a new commitment to bring themselves back, and it can usually be confused quickly for examples and strategies here See:
Comments
Post a Comment