YifanCheng
commented
7 years ago https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt This maybe a more clear documentation for this problem
Closed YifanCheng closed 7 years ago
YifanCheng
commented
7 years ago https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt This maybe a more clear documentation for this problem
This reverts commit 5355b6dcc068f855593cd42e266e99952eb350a7, reversing changes made to 53eef57f3268fc6be2c8b37c7c3db8ef117a1d81.
I made a mistake when I tried to merge in this PR: https://github.com/UW-Hydro/RBM/pull/30. Here is the reason: In the UW-Hydro/RBM 'master' branch, we reverted a pull request (https://github.com/UW-Hydro/RBM/pull/13) because the code is not thoroughly reviewed. We called the changes made in this pull request "commits A". When we reverted it, it creates a "- commit A" in master branch instead of deleting the pull request for the reason of integrity.
After code review by other people, we updated the code in develop branch and here we called the code changes "commits B". Then I made a PR from develop branch to master branch, which however only includes "commits B" and no "commits A". I missed this problem and directly merged the code in after I fixed some conflicts, which is totally wrong!!!!!!
How to fix this problem? When I fixed the conflicts, I merged the master branch into develop branch, fixed the conflicts and merged develop back into master branch. Because the master branch had "- commits A" while develop branch didn't, when master merged into develop branch, it means that "-commits A" is merged into develop branch, which is totally wrong. Thus, the right thing to do here is to revert this commit (merge 'master' into 'develop').