[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: Default version for star-merge
From: |
Stefan Monnier |
Subject: |
[Gnu-arch-users] Re: Default version for star-merge |
Date: |
12 Jul 2004 15:16:53 -0400 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
> I very recently taught a friend how to use arch. A day later, he came back
> to me and essentially asked: Since star-merge is commonly used to merge
> changes from the version you originally tagged from, why not make
> the default version to star-merge the version you tagged from.
Because I very often do
tla star-merge --three-way
in order to fetch recent changes on the current branch.
I'd be happy to use `tla update' instead, except that it does not offer an
option to use diff3.
Stefan
- [Gnu-arch-users] Default version for star-merge, James Blackwell, 2004/07/12
- [Gnu-arch-users] Re: Default version for star-merge,
Stefan Monnier <=
- Re: [Gnu-arch-users] Re: Default version for star-merge, John Meinel, 2004/07/12
- Re: [Gnu-arch-users] Re: Default version for star-merge, Tom Lord, 2004/07/12
- Re: [Gnu-arch-users] Re: Default version for star-merge, James Blackwell, 2004/07/12
- Re: [Gnu-arch-users] Re: Default version for star-merge, Tom Lord, 2004/07/12
- [Gnu-arch-users] Re: Default version for star-merge (and more), James Blackwell, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), William Dode, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), Scott Parish, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), Andrew Suffield, 2004/07/13
- [Gnu-arch-users] Re: Default version for star-merge (and more), Stefan Monnier, 2004/07/13
- Re: [Gnu-arch-users] Re: Default version for star-merge (and more), James Blackwell, 2004/07/13