04.03.2012 17:28, KP Kirchdoerfer пишет: > Am 04.03.2012 16:09, schrieb Andrew: >> 04.03.2012 16:07, KP Kirchdoerfer пишет: >>> Hi; >>> >>> I know, how I can merge a branch with master. >>> >>> But how do I merge a branch with another one, "next" in my case? >>> >>> thx kp >> Just do 'git merge<object>' - object can be branch, tag, commit, and >> your current branch will have all mods from other branch till<object>. >> Or do 'git pull<repo> <branch to merge>' if you want do pull and merge >> in one step. > Andrew; > > I want to merge my local branch with "next". > > I think I have to checkout next and then to merge my local branch. Yes, if you want to push all changes in 'next'. > But then I see pb's cause "next" is not merged with latest changes in > master? > > > kapeka@stalker:/leafcvs/git/bering-uclibc$ git branch > 4.0-fixes > gpgv > master > * next > kapeka@stalker:/leafcvs/git/bering-uclibc$ git merge gpgv > Performing inexact rename detection: 100% (5700/5700), done. > Auto-merging buildpacket.pl > Auto-merging conf/buildtool.conf > Auto-merging conf/sources.cfg > CONFLICT (content): Merge conflict in conf/sources.cfg > Auto-merging repo/dropbear/buildtool.cfg > Auto-merging repo/dropbear/buildtool.mk > CONFLICT (content): Merge conflict in repo/dropbear/buildtool.mk > Removing repo/dropbear/dropbear-0.53.1.tar.gz > Removing repo/ebtables/ebtables-v2.0.9-2.tar.gz > Removing repo/ethtool/ethtool-2.6.37.tar.gz > Removing repo/hostapd/hostapd-0.7.2.tar.gz > Auto-merging repo/initrd/buildtool.cfg > CONFLICT (content): Merge conflict in repo/initrd/buildtool.cfg > Auto-merging repo/license/buildtool.cfg > Removing repo/lzo/lzo-2.04.tar.gz > Auto-merging repo/mawk/buildtool.cfg > Removing repo/mawk/mawk_1.3.3-11.diff.gz > Removing repo/mawk/mawk_1.3.3.orig.tar.gz > Removing repo/nasm/nasm_0.98.38-1.2.diff.gz > Removing repo/nasm/nasm_0.98.38.orig.tar.gz > Removing repo/openvpn/openvpn-2.2.0.tar.gz > Removing repo/p9100/p910nd-0.8.tar.bz2 > Removing repo/pmacctd/pmacct-0.11.4.tar.gz > Removing repo/privoxy/privoxy-3.0.17-stable-src.tar.gz > Removing repo/quagga/quagga-0.99.17.tar.gz > Removing repo/radcoad/radcoad-0.1.1.tar.gz > Removing repo/rsync/rsync-3.0.7.tar.gz > Removing repo/shorewall-lite/shorewall-lite-4.4.26.1.tgz > Removing repo/shorewall/shorewall-4.4.26.1.tgz > Removing repo/shorewall6-lite/shorewall6-lite-4.4.26.1.tgz > Removing repo/shorewall6/shorewall6-4.4.26.1.tgz > Removing repo/wget/wget-1.11.4.tar.gz > Automatic merge failed; fix conflicts and then commit the result. > > > kp > Edit files that fails auto-merge and them add them into current commit (git add <file>). then just do 'git commit'.
------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
