Merge conflicts help required
Posted: Tue Jul 17, 2007 5:45 pm
Hi,
This may be me being a tad simple .. how on EARTH do I resolve conflicts???
The only options that are presented are for copying "theirs" over "mine" - the other buttons are greyed out.
I'd really appreciate an answer on this as it's causing no END of trouble as all the PC users have Tortoise which works perfectly.
Thanks,
FJ
This may be me being a tad simple .. how on EARTH do I resolve conflicts???
The only options that are presented are for copying "theirs" over "mine" - the other buttons are greyed out.
I'd really appreciate an answer on this as it's causing no END of trouble as all the PC users have Tortoise which works perfectly.
Thanks,
FJ