← Back to team overview

widelands-dev team mailing list archive

Re: [Merge] lp:~meitis/widelands/bug1375915 into lp:widelands

 

Look here:
https://wl.widelands.org/wiki/BzrPrimer/#creating-own-branch-to-add-a-new-feature-fix-a-bug-change-anything

Shortly, if you are in directory with "trunk" do:

bzr branch trunk feature-xxx

make changes in feature-xxx/

cd feature-xxx/
bzr commit -m "Feature added: xxx"
bzr push lp:~my.user.name/widelands/my-feature-xxx

You dont need to do 'bzr merge' unless there are big changes in trunk and you want to stransfer them trunk->your_branch or until your branch is approved and somebody will have to merge your branch to trunk...
-- 
https://code.launchpad.net/~meitis/widelands/bug1375915/+merge/270456
Your team Widelands Developers is requested to review the proposed merge of lp:~meitis/widelands/bug1375915 into lp:widelands.


References