Le 7 févr. 2014 à 22:09, David M Brooke <l...@davidmbrooke.co.uk> a écrit :
> Hi leaf-devel, > Hi David ! > What I did was: > - Created a new local branch (called "trac#93") based on "maint" > - Committed the code change against that new branch > - Merged the bugfix branch back into « maint" (with "--no-ff") You must firstly git checkout maint git pull —ff-only To be sure that your maint branch is uptodate, then git merge trac#93 git push This will merge your bug-fix into maint and push it to the repo. Then you can delete your local trac#93 branch After that you must not forget to report your bug-fix to « upset » branches like master with a: git checkout master git pull --ff-only git merge —no-commit maint Resolve the conflicts then commit the merge: git commit then push the new master branch to the repo: git push Regards, Yves ------------------------------------------------------------------------------ Android apps run on BlackBerry 10 Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now. http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
