Hi Ryan,
- On 23 Feb, 2017, at 12:04, Ryan Schmidt ryandes...@macports.org wrote:
> GitHub said the pull request had a conflict. (The PR is a version update, but
> a
> revbump was committed to the port in the meantime.) GitHub said I could
> resolve
> the conflict on the command line or in
On 23 February 2017 at 12:04, Ryan Schmidt wrote:
>
> GitHub said the pull request had a conflict. (The PR is a version update, but
> a revbump was committed to the port in the meantime.) GitHub said I could
> resolve the conflict on the command line or in a web-based editor. There was
> a
On Feb 23, 2017, at 04:46, Mojca Miklavec wrote:
>
> Dear Ryan,
>
> On 23 February 2017 at 11:19, Ryan Schmidt wrote:
>> Browsing pull requests, I found this one:
>>
>> https://github.com/macports/macports-ports/pull/305
>>
>> Another commit had happened to that port in
Dear Ryan,
On 23 February 2017 at 11:19, Ryan Schmidt wrote:
> Browsing pull requests, I found this one:
>
> https://github.com/macports/macports-ports/pull/305
>
> Another commit had happened to that port in the mean time, so the PR now had
> conflicts and could not be applied as-is. GitHub
Browsing pull requests, I found this one:
https://github.com/macports/macports-ports/pull/305
Another commit had happened to that port in the mean time, so the PR now had
conflicts and could not be applied as-is. GitHub invited me to edit the file on
the web to resolve the conflict, so I did.