1. From the merge dialog you individually pick and install the changes that work. In the old merge dialog this works nicely.
2. You manually fix your code, e.g. the variable changes that do not work. 3. You close the merge dialog (cancel). 4. You adopt the merged version. 5. You commit. Lukas On 12 December 2010 04:37, Damien Pollet <[email protected]> wrote: > I have a snapshot compiled against an old version of PetitParser. > Unfortunately one of my classes now has a conflicting inst var with > the most recent PetitParser, so my code does not load, MC explodes > instead of giving me a chance to fix the problem on the fly. Of > course, there are quite a few changes I'd like to rescue in that > snapshot. Please don't tell me I have to copy-paste them all… > > -- > Damien Pollet > type less, do more [ | ] http://people.untyped.org/damien.pollet > > -- Lukas Renggli www.lukas-renggli.ch
