Announcement

Collapse
No announcement yet.

Mercurial + BC4: Marking conflict after a merge

Collapse
X
 
  • Filter
  • Time
  • Show
Clear All
new posts

  • Aaron
    replied
    Thanks for the clarification. BC4 does not currently support passing this information back, and does require the manual Resolve step after a merge. I'll add your example and suggestion to our wishlist. I do believe it is related to the previous thread, but that user never got back to us with more information unfortunately.

    Leave a comment:


  • fx1
    replied
    I'm using TortoiseHg.

    Right now when there's a conflict, BC4 is called up to do a 3-way merge. Once all the conflicts are resolved, mercurial is not informed that they are resolved so I have to manually issue the hg resolve -m command.

    I'd like it to behave like kdiff3 that comes preinstalled with TortoiseHg. If all the conflicts in a file has been edited and saved it'll be mark resolved automatically.

    Maybe my issue is similar to this thread?

    Leave a comment:


  • Aaron
    replied
    Hello,

    Our save command does not clear the conflict flag. Once you perform your save, is there an issue cropping up that prevents the merge?

    Which version of Mercurial are you using and how was it configured?
    http://www.scootersoftware.com/suppo..._vcs#mercurial

    Leave a comment:


  • fx1
    started a topic Mercurial + BC4: Marking conflict after a merge

    Mercurial + BC4: Marking conflict after a merge

    How to make BC4 mark all conflicts as resolved if a merge result is saved?
Working...
X