Bale
Minion
Doesn't tell me what the conflict is. How do I manually resolve such conflicts?
In addition to what fronobulax says, there's some helpful information at the bottom of this page.
If an update to a script changes it so severely that it cannot be merGed with your modifications, it will show "C" for Conflict and produce several files in the working copy to help you solve the problem:
- myfile - will have some inline markup at the location of the conflict ( look for <<<<<< and >>>>> markup) showing you both what your text was and what the repo's text was.
- myfile.mine - Your version before the update.
- myfile.rOld - The pristine repo versions from before the update.
- myfile.rNew - The pristine repo versions from after the update.