Question #215668 on rohc changed: https://answers.launchpad.net/rohc/+question/215668
Didier Barvaux posted a new comment: Hello, If you didn't modified anything locally, the simplest way to keep in sync is the command 'bzr pull'. If you changed something locally, 'bzr pull' does not work and 'bzr merge' is required. If you are in the first case (no local modification): $ bzr revert $ bzr pull And you are up to date. More info on bazaar here: - tutorial: http://doc.bazaar.canonical.com/latest/en/mini-tutorial/ - part about 'bzr merge' : http://doc.bazaar.canonical.com/latest/en/mini-tutorial/#updating-your-branch-from-the-main-branch Regards, Didier -- You received this question notification because you are a member of ROHC Team, which is an answer contact for rohc. _______________________________________________ Mailing list: https://launchpad.net/~rohc Post to : [email protected] Unsubscribe : https://launchpad.net/~rohc More help : https://help.launchpad.net/ListHelp

