Re: Git master
Diederik van Lierop <[email protected]> Wed, 1 May 2019 21:15:07 +0200
| Newsgroups | gmane.comp.graphics.inkscape.devel |
|---|---|
| Message-ID | <[email protected]> |
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