I have pushed a merge changeset, but I found afterwards that there are some improperly resolved conflicts in the merge.
Is there any way to undo the merge?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I have pushed a merge changeset, but I found afterwards that there are some improperly resolved conflicts in the merge.
Is there any way to undo the merge?
Once you have pushed the changeset, it is available to everyone else and you cannot change it. If you are the only user of the central repository, you can use MQ and strip the offensive merge and redo it correctly. If there are other people using the central repository, your only option would be to push a changeset that fixes the problems that you were unable to fix during your merge.