Re: [Gnu-arch-users] merge between two branchs

[James Blackwell]

In lists.arch.users, you wrote:
> Hi,
>
> I begin with arch and really like the idea of decentralized
> developpement...
>
> What is the good way to merge two branchs without and before merging to
> the main branch ?
>
> I've branch MAIN and two forks : B1 and B2.
> I would like to incorporate somes patchs of B1 in B2
>
> When B1 and B2 finish their works i whant to merge them in the MAIN
> branch.

$ tla get project--main  mymain
$ cd mymain
$ tla star-merge project--b1--1.1
 [ make sure everything is kosher]
$ tla commit -L"Merged in work from B1"

$ tla star-merge project--b2--1.1
 [ make sure everything is kosher]
$ tla commit -L"Merged in work from B2"

> thanks

Hope that helps. 


>
> -- 
> William Dodé - http://flibuste.net
>
>
> _______________________________________________
> Gnu-arch-users mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/gnu-arch-users
>
> GNU arch home page:
> http://savannah.gnu.org/projects/gnu-arch/
>


-- 
James Blackwell          Please do not send me carbon copies of mailing
Smile more!              list posts. Such mail is unsolicited. Thank you!

GnuPG (ID 06357400) AAE4 8C76 58DA 5902 761D  247A 8A55 DA73 0635 7400