Le 21 sept. 2012 à 17:47, KP Kirchdoerfer a écrit : > Hi; > > before I'm doing something wrong here, I'd like to ask how do I merge a > a single commit (made to maint) into master? > > The commit in question is > 8045dd5b69f48127d39fc1171c52e4be69b11993 > > http://leaf.git.sourceforge.net/git/gitweb.cgi?p=leaf/bering-uclibc;a=commit;h=8045dd5b69f48127d39fc1171c52e4be69b11993 > > btw: I've released 4.3.1-rc1 today and do not expect to see more changes > for 4.3.1. > > thx kp
Hi KP, never commit a single commit from maint to next. Next must be a superset of maint. You need to merge maint into master like i wrote on the git workflow: https://sourceforge.net/apps/mediawiki/leaf/index.php?title=Bering-uClibc_5.x_-_Developer_Guide_-_Appendices_-_Git_Workflows#Recipe:_Update_master_branch_from_maint So you need to do a: git checkout master git pull --ff-only git merge --no-commit maint Resolve conflicts then commit with a message like: Sync with 4.3.1-rc1 Then git push I can do it for you if you want. Yves To help resolv futur conflicts you can activate the git rerere functionality (http://git-scm.com/2010/03/08/rerere.html) with the command: git config --global rerere.enabled 1 ------------------------------------------------------------------------------ Got visibility? Most devs has no idea what their production app looks like. Find out how fast your code is with AppDynamics Lite. http://ad.doubleclick.net/clk;262219671;13503038;y? http://info.appdynamics.com/FreeJavaPerformanceDownload.html _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
