[glideplan_swproj] Re: [glideplan_swproj] Re: merging

  • From: Tomáš Zámečník <pulcik@xxxxxxxx>
  • To: glideplan_swproj@xxxxxxxxxxxxx
  • Date: Mon, 12 Dec 2011 22:19:41 +0100 (CET)

No stress:)

It's up to Kuba and Cestmir to merge their branches to master.
Then you can push your own changes.
And if you haven't changed anything in the directory updraft/Updraft (e.g. when 
you was working on experements),
you can push your changes whenever you want, there shouldn't be any collisions.

T.

> ------------ Původní zpráva ------------
> Od: Mária Vámošová <maria.vamosova@xxxxxxxxx>
> Předmět: [glideplan_swproj] Re: merging
> Datum: 12.12.2011 22:11:27
> ----------------------------------------
> Hi!
>
> Could you please wait 20 minutes till I fix my coding style? :)
>
> Maria
>
> 2011/12/12 Tomáš Zámečník <pulcik@xxxxxxxx>:
> > Hi, it's time to merge working branches to master.
> >
> > In my opinion, both Kuba and Cestmir should do the merge of their branches 
> > to
> master theirselves and as soon as possible.
> >
> > Since the merge is finished, please use your personal online branches for
> backup purposes only
> > and try to keep master branch up to date.
> > Especially when somebody claims that he fixed a bug or implemented a feature
> (e.g. by closing the issue),
> > the changes must be already pushed to master branch.
> >
> > Tom
> >
> > To visit archive or unsubscribe, follow:
> > http://www.freelists.org/list/glideplan_swproj
>
> To visit archive or unsubscribe, follow:
> http://www.freelists.org/list/glideplan_swproj
>
>
>

To visit archive or unsubscribe, follow:
http://www.freelists.org/list/glideplan_swproj

Other related posts:

  • » [glideplan_swproj] Re: [glideplan_swproj] Re: merging - Tomáš Zámečník