Re: [Gnu-arch-users] Re: Default version for star-merge

[John Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

What about the ++star-merge fix? (Keep a file that remembers what the
last branch you star-merged from). Because that would remember that the
last place you star-merged from is this branch. You would have to type
it the first time, but after that it would just remember. In my
suggestion this is filled out by tag, but it wouldn't have to be. It
could be empty until the first tla star-merge.

John
=:->

Stefan Monnier wrote:
|>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 mailing list
| address@hidden
| http://lists.gnu.org/mailman/listinfo/gnu-arch-users
|
| GNU arch home page:
| http://savannah.gnu.org/projects/gnu-arch/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFA8uSRJdeBCYSNAAMRAspnAJ4vqSLjuj57JUCCpSzNPBKm4EHHdwCeIHzB
6TDAIct3/lTkleDFuodBcb8=
=cnZp
-----END PGP SIGNATURE-----