On Jul 6, 2017, at 2:58 PM, Graham Bloice wrote:
> I have always found this amusing in times of git induced stress:
> http://stevelosh.com/blog/2013/04/git-koans/
Thank you. I have added that to my bookmark collection.
Losh's projects page:
http://stevelosh.com/projects/
mentions a
On 6 July 2017 at 22:47, Guy Harris wrote:
> On Jul 6, 2017, at 1:39 PM, Graham Bloice
> wrote:
>
> > Careful, I only know enough git to work out things have gone wrong and
> very specific ways of getting out of trobule. Glad to be of help.
>
> https://xkcd.com/1597/ (make sure you read
On Jul 6, 2017, at 1:39 PM, Graham Bloice wrote:
> Careful, I only know enough git to work out things have gone wrong and very
> specific ways of getting out of trobule. Glad to be of help.
https://xkcd.com/1597/ (make sure you read the mouseover tooltip)
http://forums.xkcd.co
gt; Behalf Of *Graham Bloice
> *Sent:* 05 July 2017 13:17
> *To:* Developer support list for Wireshark
> *Subject:* Re: [Wireshark-dev] Gerrit Patch Set Submission Problem
>
>
>
>
>
>
>
> On 5 July 2017 at 12:47, Paul Offord wrote:
>
> Hi,
>
>
>
> I’m s
...@wireshark.org] On Behalf Of
Graham Bloice
Sent: 05 July 2017 13:17
To: Developer support list for Wireshark
Subject: Re: [Wireshark-dev] Gerrit Patch Set Submission Problem
On 5 July 2017 at 12:47, Paul Offord
mailto:paul.off...@advance7.com>> wrote:
Hi,
I’m struggling with git again. I want to
Hi Paul
You have a merge branch in between two syncro branches. That happens, when
you are not working cleanly of branches, but instead pull changes into the
master branch.
Take a look at
git log
You should see your Syncro at the top, then a merge-branch and then again a
syncro at the bottom. T
Cheers Graham – I’ll give that a go. Beer in the post.
From: Wireshark-dev [mailto:wireshark-dev-boun...@wireshark.org] On Behalf Of
Graham Bloice
Sent: 05 July 2017 13:17
To: Developer support list for Wireshark
Subject: Re: [Wireshark-dev] Gerrit Patch Set Submission Problem
On 5 July
On 5 July 2017 at 12:47, Paul Offord wrote:
> Hi,
>
>
>
> I’m struggling with git again. I want to submit a new patch set for
> change 19666 - https://code.wireshark.org/review/#/c/19666/
>
>
>
> When I try git review I get:
>
>
>
> C:\Development\wireshark>git review
>
> You are about to submit
Hi,
I'm struggling with git again. I want to submit a new patch set for change
19666 - https://code.wireshark.org/review/#/c/19666/
When I try git review I get:
C:\Development\wireshark>git review
You are about to submit multiple commits. This is expected if you are
submitting a commit that is
