Hi Benjamin, Can I just clarify something for those using Ground Control.
>From memory, when you click 'update' (ie pull) to make sure you have the latest revision, then make changes to a file, your only option in Groud Control is to then 'commit changes'. If I understand it correctly, the sequence would be: 1. First click 'update' (pull); 2. Make changes; 3. Commit changes; 4. Click 'update' again (to pull any new revisions) 5. Then click 'upload' (ie push your commited changes to the main branch). Please correct me if I am wrong! JaminDay On Tue, Mar 23, 2010 at 9:37 AM, Benjamin Humphrey <humphre...@gmail.com>wrote: > Hi guys, > > Just a reminder that you need to *pull *the bzr branch before you push, > this is *very important.* > * > * > We almost lost 30 revisions of work today because someone didn't update > their old local branch before they committed, causing a huge merge and a > tonne of conflict resolves. Wasn't pretty. > > The result is that yesterday we were on revision 565 but today we are on > revision 531 - even though 531 is newer. This will cause a bit of a headache > with all the testing going on, as everyone is testing revision 554, which is > older but a high revision number, so when it gets updated they're going to > be hella confused. > > So remember: > > *PULL BEFORE YOU PUSH.* > > Thanks! > -- > Benjamin Humphrey > > Ubuntu Manual Team Lead > Dunedin, New Zealand > > http://www.ubuntu-manual.org > www.interesting.co.nz > > > > _______________________________________________ > Mailing list: > https://launchpad.net/~ubuntu-manual<https://launchpad.net/%7Eubuntu-manual> > Post to : ubuntu-manual@lists.launchpad.net > Unsubscribe : > https://launchpad.net/~ubuntu-manual<https://launchpad.net/%7Eubuntu-manual> > More help : https://help.launchpad.net/ListHelp > >
_______________________________________________ Mailing list: https://launchpad.net/~ubuntu-manual Post to : ubuntu-manual@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-manual More help : https://help.launchpad.net/ListHelp
