Public SourceMage Discussion List

[Ladislav Hagara <ladislav.hagara AT unob.cz>]

> > > Howdy all,
> > >
> > > just looking through the git commits committed during Ibiblio Down Time 
> > > and wondering about update of inkscape.
> > > Seem inkscape was first updated to 0.44.1 by George Sherwood [1] and 
> > > after 6 hours it was updated again to 0.44.1 by Flavien Bridault [2].
> > > It is strange there are no conflicts in git.
> > > Is it a bug or a feature of git?
> > >
> > > [1] 
> > > http://scmweb.sourcemage.org/gitweb.cgi?p=smgl/grimoire.git;a=commitdiff;h=66d6d9f836acc306c8292c68bce67908f5963d08;hp=9d087019784a2f24c2be2a6080e0cc32cffdaa57
> > > [2] 
> > > http://scmweb.sourcemage.org/gitweb.cgi?p=smgl/grimoire.git;a=commitdiff;h=b691ea6954edd455e4c2fb7a966b0d7241d69622;hp=9d087019784a2f24c2be2a6080e0cc32cffdaa57
> > >
> > >       
> > imho the problem is rather between the keyboard and the screen... ;-)
> >
> > There was a conflict when I merged origin in my master head. So I simply
> > removed my own entry in history and my sig, and then the merging was ok.
> > But of course the git log still mentions my initial commit.
> > What was I supposed to do ? Revert my commit ? Go back at a previous
> > head (not always handy if you did some commits after the conflicting
> > one).
> >     
>
> What you did is ok imo. I never use pull when I have changes in my own
> tree, so not sure how that handles conflicts.
> When you use rebase, it will stop at such conflicting changes, you can
> then tell it to skip your change and continue with the rest. That way
> you can avoid the duplicate commit. The main disadvantage of rebase is
> that it changes all commit-ids of the rebased commits, so you should
> keep that in mind if you already wrote that id in a bug or somewhere
> else.

I am still only novice in git and I really do not known what is better.
Seems now we have had the same situation.
I updated the libidn [1] and after me /Treeve Jelbert also updated it 
[2] and later on he reverted his commit [3].
It is nice that in commit's email there are no changes of libidn so it 
is not confusing [4].
I was also surprised that commits on www [5] are sorted according to the 
local time of developer and not by time of commits to the server.
Still novice. :-)
/
[1] 
http://scmweb.sourcemage.org/gitweb.cgi?p=smgl/grimoire.git;a=commitdiff;h=8fda357b69f4b0436af64103fd8dca9939a5cc41
[2] 
http://scmweb.sourcemage.org/gitweb.cgi?p=smgl/grimoire.git;a=commitdiff;h=19e7ef2f2f11fcb5868e0350982be6d1b7585754
[3] 
http://scmweb.sourcemage.org/gitweb.cgi?p=smgl/grimoire.git;a=commitdiff;h=9486798a088ac4a9d5fc14882c925ca8bcfed93f
[4] https://lists.ibiblio.org/sympa/arc/sm-commit/2006-September/006162.html
[5] http://scmweb.sourcemage.org/gitweb.cgi?p=smgl/grimoire.git;a=shortlog

--
Ladislav Hagara