> So in this case, in order to keep your incoming changes, I am
> essentially rejecting the previous fix from Mark McCahill that has the
> comment "Peter Moores fix to the TMaterial>>disable: method to  change
> from DefaultEmission to DefaultEmissive"
>
> That doesn't sound like a good thing to do.
>
>> > I think that something else is required for item 1 because I can't
>> > just click on Merge - it is greyed out.  Do I need to "Keep" each of
>> > the highlighted conflicts in order to proceed with the Merge?
>>
>> Ah, yes. If you have selectors displayed in bold it means you have
>> conflicting changes and need to decide whether to "keep" the incoming
>> change or to "reject" the incoming change (and I *hate* these terms, and
>> hopefully I got them right this time). You can only proceed with the
>> merge once you've decided how to deal with the conflicts. Notice that
>> often the "rest local" or "rest remote" buttons are what you really
>> want. The first one (rest local) means "I want my local changes to
>> prevail" whereas the latter says "I want what's current in the
>> repository".
>
>