Resolving pull request conflicts

[John Patrick]

If you edit the file the change is then tagging against you.

How I would resolve it is.
1) fetch the latest branch (either develop/master depending how git is
being used)
2) merge latest branch into your pull request branch
2.1) I usually do this with --no-commit
2.2) fix merge comflicts
2.3) commit with git commit --no-edit
3) push your pull request branch again

Not sure if this is how mac ports developers want to use git, realise
mac ports are still only just moving over to git but that is how i've
been doing pull request conflicts for other projects for 3-4 years.

John


On 23 February 2017 at 10:19, Ryan Schmidt <ryandesign at macports.org> 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 invited me to edit the file on the web to resolve the conflict, so I did. I was then asked by the PR author not to do that. Can someone explain why resolving the conflict was bad?
>
>