25 Jun
2013
25 Jun
'13
5:52 p.m.
2013/6/25 Martin Owens <doctormo@...400...>:
Try not to do `bzr merge parent/lp:inkscape` because you'll then be committing someone else's work as if you merged it for them. Especially several someones.
That's not true; if you merge from trunk to your own branch, and later merge your branch into trunk, it will not affect the revisions on trunk which you've merged. In fact merging from trunk from time to time is encouraged, because it allows you to keep up to date and reduces the risk of surprise bugs appearing only after the final merge.
Regards, Krzysztof