This is the mail archive of the
archer@sourceware.org
mailing list for the Archer project.
Re: Proposal to change branch maintenance
On Mon, 18 Feb 2013 17:10:22 +0100, Tom Tromey wrote:
> Also I think we should delete all the branches that we got from
> gdb.git. There's no need for them in archer.git.
I already did so, where do you see them?
archer.git "master" deletion (+branches cleanup)
Message-ID: <20111226231836.GA32067@host2.jankratochvil.net>
http://sourceware.org/ml/archer/2011-q4/msg00010.html
http://sourceware.org/ml/archer/2012-q1/msg00001.html
> I found this that shows a way that we could make README.archer work
> without excessive merge issues:
>
> http://stackoverflow.com/questions/2108405/branch-descriptions-in-git
> http://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-on-a-s/930495#930495
Those are two big pages with many solutions, which one do you mean?
I quickly found there only dropping of the merged content; but in fact the
list of merged branches would be exactly useful during the merging:
Currently I track a separate file "IMPORT" generating the merged branches list
there (currently only 2, there were many), this could be done automatically
now, see the header of:
http://pkgs.fedoraproject.org/cgit/gdb.git/tree/gdb-archer.patch
> Alternatively we could pick the README file name based on the branch
> name. This isn't as convenient but it would also work.
The convenience depends on whether it is for branch author or for the merge
maintainer. :-)
Jan