On 03/05/2012 07:28 AM, KP Kirchdoerfer wrote:
> Am 05.03.2012 12:22, schrieb Andrew:
-snip-
>> Edit files that fails auto-merge and them add them into current commit
>> (git add<file>). then just do 'git commit'.
>
> Just found my error:
>
> The new branch has to be *based on "next"* instead of master:
>
> *git checkout -b new-branch next*
>
> After changing files in new-branch
> git checkout next
> git merge new-branch
>
> and all is well.
KP,
Good to hear. I just ran into another git tool that may be of use.
gitg
https://live.gnome.org/Gitg
--
Mike Noyes
http://sourceforge.net/users/mhnoyes
https://profiles.google.com/mhnoyes
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
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-d2d
_______________________________________________
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel
