Hi Hans Peter, usually I click on the package version and press merge. When there is a conflict I select the item and decide which one I keep either the incoming or the other. This is not working for you? May be we got a glitch. Stef On 11/11/14 09:34, Holger Hans Peter Freyther wrote:
Hi,
I am sorry if that is the wrong mailinglist. I know how to merge code with vimdiff, manual merge markers, kdiff3, meld but I just can't figure out how to do it with monticello.
In the codebase I am using calls to >>#createDialogue were replaced with >>#newDialogue but I have a local modification that replaces a wrong call to >>#failure with >>#signalFailure.
For a given method/selector. I do select what I want from the other code (the newDialogue change) and I select what I want from my code. The text/code in the bottom pane looks good but the number of conflicts don't go down. If I unselect the "Apply this change" then my original code without >>#newDialogue is there. In case I modify the text at the bottom and try to save it.. nothing happens.
Can someone point me to an example/documentation?
holger