Re: Emacs antialiasing in X

[Miles Bader]

2006/1/16, Jan D. <address@hidden>:
> > Are you telling me that edits made to ChangeLog, NEWS, etc., in the
> > XFT branch are expendable?
>
> Kenichi Handa:s suggestion about separate files is a good one.

Yes, giving all "high conflict" files like ChangeLog etc.
branch-specific names is a good idea, and neatly avoids the most
common (and annoying) cause of merge conflicts.

I do it on my personal branches too.

-Miles
--
Do not taunt Happy Fun Ball.