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

Joshua Root jmr at macports.org
Wed May 22 21:37:47 UTC 2019

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 committer at some point pulled in changes to a branch which they subsequently pushed to master without rebasing.
> Jann, I assume you just ran 'git pull' which created this merge commit.
> The better option would have been to run 'git pull --rebase' to avoid
> this merge and place your new commit on top of the existing
> macports-ports master.

Discussion on IRC indicates it was done from the GitHub web UI.

- Josh

More information about the macports-dev mailing list