sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772)
- From: Eric Sandall <eric AT sandall.us>
- 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 11:49:28 -0700
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.
-sandalle
--
Eric Sandall | Source Mage GNU/Linux Developer
eric AT sandall.us PGP: 0xA8EFDD61 | http://www.sourcemage.org/
http://eric.sandall.us/ | http://counter.li.org/ #196285
Attachment:
signature.asc
Description: This is a digitally signed message part.
-
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772),
Treeve Jelbert, 04/11/2008
-
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772),
Andraž 'ruskie' Levstik, 04/11/2008
-
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772),
Treeve Jelbert, 04/11/2008
-
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772),
Eric Sandall, 04/11/2008
-
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772),
Treeve Jelbert, 04/11/2008
- Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772), Andraž 'ruskie' Levstik, 04/11/2008
-
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772),
Treeve Jelbert, 04/11/2008
-
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772),
Eric Sandall, 04/11/2008
-
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772),
Treeve Jelbert, 04/11/2008
-
Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7bfa06254ad8ea05b2d40862a763a8a180d4d772),
Andraž 'ruskie' Levstik, 04/11/2008
Archive powered by MHonArc 2.6.24.