sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
Re: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (483fe02f406c082d2f888591838a8deba7ccb012)
- From: Eric Sandall <eric AT sandall.us>
- To: SM-Commit <sm-commit AT lists.ibiblio.org>
- Subject: Re: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (483fe02f406c082d2f888591838a8deba7ccb012)
- Date: Thu, 30 Nov 2006 20:33:59 -0800
Ladislav Hagara wrote:
> I am very sorry but I still don't get accustomed to git, specially git
> integrations and git reviews.
> For me they are still confusing or even chaotic. Of course it can be
> only my problem.
> For example this mail. It is impossible to responsibly review it.
> Why so much conflicts? Why these strange changes?
> For example firefox, small change in DEPENDS together with over 30
> deleted lines from HISTORY.
> Next kopete, added deprecated UPDATED with again so much deleted lines
> from HISTORY.
> How is it possible?
The "Conflicts" entries just show which files had to be merged manually
(edit, mark as merged, commit). As for the discrepencies you mention, it
could be that I merged them incorrectly, though from my end the changes
I submitted *looked* like the commit id I was integrating.
-sandalle
--
Eric Sandall | Source Mage GNU/Linux Developer
eric AT sandall.us | http://www.sourcemage.org/
http://eric.sandall.us/ | SysAdmin @ Shock Physics @ WSU
http://counter.li.org/ #196285 | http://www.shock.wsu.edu/
-
[SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (483fe02f406c082d2f888591838a8deba7ccb012),
Eric Sandall, 11/30/2006
-
Re: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (483fe02f406c082d2f888591838a8deba7ccb012),
Ladislav Hagara, 11/30/2006
- Re: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (483fe02f406c082d2f888591838a8deba7ccb012), Eric Sandall, 11/30/2006
-
Re: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (483fe02f406c082d2f888591838a8deba7ccb012),
Ladislav Hagara, 11/30/2006
Archive powered by MHonArc 2.6.24.