Re: Git master

Hi Diederik,

It's all good, you didn't mess anything up. But yes, most of us use a
slightly different workflow: git rebase. Rebasing is particularly easy
if you make a merge request instead of pushing directly to master,
because the web interface has a Rebase button :-) You did a regular
merge (actually you merged twice). See attached image which shows the
merge graph. If you would have rebased instead, your commit would have
simply been moved to the top of the history.

Nothing gets queued in git, but push time doesn't affect commit time.
You committed yesterday, but pushed today.

Cheers,
  Thomas




On Wed, May 1, 2019 at 9:16 PM Diederik van Lierop <[email protected]> wrote:
>
> On 5/1/19 7:50 PM, Diederik van Lierop wrote:
> > Hi,
> >
> > Did I just mess up the master branch? When I look at the latest merge
> >
> > https://gitlab.com/inkscape/inkscape/commit/7dd5c6f7f9d6d07517e7933fd43b46b833088227
> >
> >
> > I see deltas which I cannot explain.
>
> The deltas I mentioned are repeated from Jabbier's commit, so this looks
> ok; I don't understand though what's happening behind the scenes
> exactly; For example why does it show "Merge branch 'master' of
> gitlab.com:inkscape/inkscape" only for my commits, and not for anyone
> else's? Am I using a different workflow than you all? Also, my first
> merge happened 22 hours ago, but Bryce only granted me rights about 19
> hours ago. Did it get queued when I tried it the first time without
> access rights, and did it get exected once Bryce granted me the rights?
>
> Best regards,
>
> Diederik
>
>
> _______________________________________________
> Inkscape-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/inkscape-devel

_______________________________________________
Inkscape-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/inkscape-devel