Simple bad merge scenario in mercurial
Posted
by user281180
on Stack Overflow
See other posts from Stack Overflow
or by user281180
Published on 2010-04-14T10:48:14Z
Indexed on
2010/04/14
10:53 UTC
Read the original article
Hit count: 317
Filed under:
mercurial
- I have created a repository AAA and another BBB.
- In AAA I have created a file A with the values a1, a2, a3 and commit
- In BBB I have created a file B with the values b1, b2, b3, commit and export a bundle.
- I add the bundle in AAA and merge.
- I make a change in B, and write b33 in AAA and another change in B and write b23 in BBB. and commit both. I create bundle of BBB and add the bundle in AAA. I do a merge.
- Now I decide to revert to the revert to step 2. I no more want to have the merge of 4. changes done in B as they were bad merges.
- Now I want to add the bundle of 3 but I can see that it can`t see any changes anymore. Why? How can I do the merge once more?
© Stack Overflow or respective owner
