Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <treeve AT scarlet.be>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772)
  • Date: Fri, 11 Apr 2008 21:04:16 +0200

On Friday 11 April 2008 20:49:28 Eric Sandall wrote:
> On Friday 11 April 2008 11:45:11 Treeve Jelbert wrote:
> > On Friday 11 April 2008 20:00:28 Andraž 'ruskie' Levstik wrote:
>
> <snip>
>
> > > You're supposed to cherry-pick the spell over from the
> > > modular-branch... not add a new instance of the spell. This will cause
> > > issues further down the line with merging.
> > >
> > > See: http://www.sourcemage.org/Git_Guide on cherry-picking
> >
> > I tried to cherry-pick, but I got error that did not understand
>
> Do you still have the error? Without cherry-picking, when we merge
> devel-xorg- modular-7-3 <-> master we'll run into a conflict and have to
> manually fix it.


$ git-cherry-pick 4ae61a864b948710bed6d5cc39580e3882bfc323
warning: too many files, skipping inexact rename detection
CONFLICT (delete/modify): xorg-lib/pixman/DETAILS deleted in HEAD and
modified
in 4ae61a8... "pixman-0.10.0". Version 4ae61a8... "pixman-0.10.0" of xorg-
lib/pixman/DETAILS left in tree.
CONFLICT (delete/modify): xorg-lib/pixman/HISTORY deleted in HEAD and
modified
in 4ae61a8... "pixman-0.10.0". Version 4ae61a8... "pixman-0.10.0" of xorg-
lib/pixman/HISTORY left in tree.
Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and
commit
the result.
When commiting, use the option '-c 4ae61a8' to retain authorship and message.

>



> -sandalle


--
Regards, Treeve




Archive powered by MHonArc 2.6.24.

Top of Page