Checkout Specific Version in Merge Conflict

Asked by Jon Wadsworth on 2012-07-31

This is a quick question that somebody may be able to answer. I have a problem that I am trying to merge a branch and I get some 5000 merge conflicts. What I know is that my local files should be used over the ones that I am merging. I come from get and what I would do is basically use this in git

git checkout --ours *

This would tell the versioning software to use all my changes. My question is, is there an equivalent command in Bazaar?

Thank you for your input.

Jon

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
2012-07-31
Last reply:
2012-07-31
Martin Packman (gz) said : #1

You can use:

     bzr resolve --take-this

However, if the branch you're merging is that messed up, you may want to drop its history as well, by either doing a cherrypick of the changes you actually want:

    bzr merge -r-2..-1 ../other_branch # take changes only from last revision

Or by merging and resolving as normal then dropping the merge info:

    bzr revert --forget-merges

Can you help with this problem?

Provide an answer of your own, or ask Jon Wadsworth for more information if necessary.

To post a message you must log in.