If that is indeed the case (although it would seem strange to me to not have
such a commonly used feature), then we should recommend not using it, certainly
for MacPorts related work.
I use the GitHub Desktop app. It is nice to have a graphical display of
differences and to be able to sele
On May 23, 2019, at 03:13, Chris Jones wrote:
> On 22/05/2019 10:41 pm, Jann Röder wrote:
>> 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.
>
> If that is inde
On 22/05/2019 10:41 pm, Jann Röder wrote:
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.
If that is indeed the case (although it would seem strange to me to not
have su
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/).
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
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
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
Thanks for checking. My git-fu was not sufficient to make sure we didn't wind
up somewhere we didn't belong with this.
Ken
On 2019-05-21, at 4:06 PM, Christopher Jones wrote:
>
> Hi,
>
> Its a merge commit, i.e. the committer at some point pulled in changes to a
> branch which they subseque
Hi,
Its a merge commit, i.e. the committer at some point pulled in changes to a
branch which they subsequently pushed to master without rebasing.
Its ‘OK’ in that its not a real commit. The changes you see in GitHub won’t
really happen (if you look in detail they are commits already in master
