@Mathewlenning can you update your PR? Github thinks we have merge conflicts

How do I identify where a merge conflict could possibly be coming from?

@Mathewlenning Now all is ok github is happy with you :)

How do I identify where a merge conflict could possibly be coming from?

hmm i don't know maybe @roland-d can help here?

I think I figured it out the hard way. I just went to the folder in the Joomla repository and checked the history of the class.

@roland-d I'm hoping you know a better way =^P

@Mathewlenning @zero-24 To see merge conflicts you can click on the Details link. I assume you can see that as well :)

@roland-d thanks but it seem like I can only see the details button on pull requests that can be automatically merged. This is what it looks like when there is a conflict

@Mathewlenning Aha, that I didn't know. Someone with access will have to post the conflicts then.

You can't see the conflicts via the GitHub UI. If you're running git from a command line the easiest way is to fetch the current staging branch and merge it to your branch; git will show any conflicts. FWIW, I see a "Merge pull request" button right now and no conflicts notice.

Thank you for creating this. It’s been some time since you created this and there are now some merge conflicts that prevent a direct merge. I will close this PR now. If you want to update your PR, then this can be re-opened.