widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

Since the changes are small and current, there is no need to merge trunk into the branch first. So, this will do:


    $ cd ~/widelands-repo/trunk
    $ bzr pull (to get any recent changes to the main trunk)
    $ bzr merge ../bug-xxx
    $ bzr commit -m "Bug xxx fixed"
    $ bzr push lp:widelands/trunk

I usually grab the branch for merging from launchpad - merge requests already display the code needed on top of the page:

To merge this branch: 	bzr merge lp:~widelands-dev/widelands/tutorial-improvements

-- 
https://code.launchpad.net/~widelands-dev/widelands/tutorial-improvements/+merge/260656
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands.