Re: [Gnu-arch-users] Re: Two branches, slightly different set of files

[Erik de Castro Lopo]

On Sat, 01 May 2004 11:49:56 +0200
Jean Helou <address@hidden> wrote:

> Except that if you add a new "private" file to the "private" branch, you 
> will have to delete it from the public branch after the next star-merge. 
> and this each time you add one.

This can be got around by adding an empty file to the private branch
merging to the public branch, then deleting from the public branch
before adding any content to the new file in the private branch.

This should work quite nicely for me.

Erik
-- 
+-----------------------------------------------------------+
  Erik de Castro Lopo  address@hidden (Yes it's valid)
+-----------------------------------------------------------+
"I want to make sure (a user) can't get through ... an online
experience without hitting a Microsoft ad."
 - Microsoft CEO, Steve Ballmer on the Microsoft search engine.