Re: URGENT -- massive merge commit on macports/macports-ports

2019-05-22 Thread Christopher Chavez
On 5/22/2019 4:37 PM, Joshua Root wrote: Discussion on IRC indicates it was done from the GitHub web UI. My impression is they were using GitHub desktop (https://desktop.github.com/).

Re: URGENT -- massive merge commit on macports/macports-ports

2019-05-22 Thread Jann Röder
On 22/05/2019 at 22:37 Joshua Root wrote: > > Discussion on IRC indicates it was done from the GitHub web UI. > The github app. I don't think you can even rebase in that. -- Jann Röder PGP key ID: 0x7698DB91

Re: URGENT -- massive merge commit on macports/macports-ports

2019-05-22 Thread Joshua Root
On 2019-5-23 06:49 , Rainer Müller wrote: > As a reference for everyone, we are talking about this commit in this > thread: > https://github.com/macports/macports-ports/commit/8636b39946229023fecc2c8c5d99be1b0a0bccd1 > > On 22.05.19 01:06, Christopher Jones wrote: >> Its a merge commit, i.e. the c

Re: URGENT -- massive merge commit on macports/macports-ports

2019-05-22 Thread Rainer Müller
As a reference for everyone, we are talking about this commit in this thread: https://github.com/macports/macports-ports/commit/8636b39946229023fecc2c8c5d99be1b0a0bccd1 On 22.05.19 01:06, Christopher Jones wrote: > Its a merge commit, i.e. the committer at some point pulled in changes to a > bran