On 04/05/11 17:48, Andrew Stubbs wrote:
What Richard must have done is merged lp:gcc-linaro/4.6 *to* his
development branch, and then pushed that branch with --overwrite, thus
rewriting history. :(
Just to be clear, here's the correct way to do a merge:
[assuming you want to reuse an existing branch]
bzr pull --overwrite lp:gcc-linaro/4.6
bzr merge lp:.....whatever.....
[...resolve-conflicts....]
bzr resolve
bzr commit
bzr push lp:gcc-linaro/4.6
In other words, please merge *from* development branches *to* release
branches.
Thanks
Andrew
_______________________________________________
linaro-toolchain mailing list
linaro-toolchain@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-toolchain
