[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Emacs antialiasing in X
From: |
David Abrahams |
Subject: |
Re: Emacs antialiasing in X |
Date: |
Mon, 16 Jan 2006 08:32:58 -0500 |
User-agent: |
Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) |
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
- Re: Emacs antialiasing in X, (continued)
- Re: Emacs antialiasing in X, Jan D., 2006/01/17
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/17
- Re: Emacs antialiasing in X, Miles Bader, 2006/01/17
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/19
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/28
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/17
- Re: Emacs antialiasing in X, Stefan Monnier, 2006/01/16
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/16
- Re: Emacs antialiasing in X, Emfox Zhou, 2006/01/16
- Re: Emacs antialiasing in X, Stefan Monnier, 2006/01/15
- Re: Emacs antialiasing in X,
David Abrahams <=
- Re: Emacs antialiasing in X, YAMAMOTO Mitsuharu, 2006/01/16
- Re: Emacs antialiasing in X, Jan Djärv, 2006/01/15