Hi I'm following the instructions on our website at [1] but I'm missing one critical part of information.
If I clone the repository one weekend and then come back to it a week later the first thing I need to do is to update master branch (lp:inkscape / trunk) so I have the latest commits on my local machine. How is this done properly?
"git bzr sync" from [2] seems to be the right command but I'm not sure, it succeeds without errors most of the time. "git pull" doesn't work because I don't have any remotes in my "git" repository. "git bzr pull" gives errors some times but not always.
The errors I get from both "git bzr sync" and "git bzr pull" are as follows: "warning: Not updating refs/heads/bzr/master (new tip bbdb26a8c9d67d9c75d03c43b8db4686008a0913 does not contain deaf8922dbca36e15fe43a72b2b4320ae649a42f)"
The message is sort of obvious that my local branch and remote have diverged but they have not when I compare "git log" with the commits available on launchpad in lp:inkscape.
[1] https://inkscape.org/en/develop/using-git-repositories/ [2] https://bazaar.launchpad.net/~termie/git-bzr-ng/master/view/head:/README.rst
Any help is appreciated. Regards -- Christoffer Holmstedt