sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5d08b0e631f1f78f5c2074ba1216f2d045f19a9d)
- From: Arwed von Merkatz <v.merkatz AT gmx.net>
- To: sm-commit AT lists.ibiblio.org
- Subject: Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5d08b0e631f1f78f5c2074ba1216f2d045f19a9d)
- Date: Sun, 19 Apr 2009 10:48:48 +0200
On Sat, Apr 18, 2009 at 02:51:52PM -0700, Eric Sandall wrote:
> I am unsure if reverting and then integrating the new version was the
> correct approach, though it was the easiest with all the conflicts I
> ran in to. Would a better approach have been to integrate the 1.6.1
> update and merge the conflict by removing the 1.5.3 patchset, leaving
> HISTORY untouched?
I think having all info in HISTORY would be better, although the git
history still has all info.
--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org
-
[SM-Commit] GIT changes to master grimoire by Eric Sandall (5d08b0e631f1f78f5c2074ba1216f2d045f19a9d),
Eric Sandall, 04/18/2009
-
Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5d08b0e631f1f78f5c2074ba1216f2d045f19a9d),
Eric Sandall, 04/18/2009
- Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5d08b0e631f1f78f5c2074ba1216f2d045f19a9d), Arwed von Merkatz, 04/19/2009
-
Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5d08b0e631f1f78f5c2074ba1216f2d045f19a9d),
Eric Sandall, 04/18/2009
Archive powered by MHonArc 2.6.24.