Re: Emacs antialiasing in X

[David Abrahams]

Stefan Monnier <address@hidden> writes:

>> I appreciate that you're trying to help (really!) but I don't
>> understand what you're telling me yet.  I'm concerned because there
>> are merge conflicts in the plain "ChangeLog," etc., files.  If I am
>> going to merge the branches I have to resolve those, don't I?
>
> Actually, for such files, you don't have to resolve the conflicts.
> Just make sure that the complete info about the conflict is kept somewhere
> so it can be resolved at some point in the future.  Someone else can resolve
> those conflicts for you and you can concentrate on the code itself.

That's a huge relief, thanks.

-- 
Dave Abrahams
Boost Consulting
www.boost-consulting.com