HMGforum.com

kcarmody wrote: ↑Sat Oct 31, 2020 5:33 pm

Rathinagiri wrote: ↑Sat Oct 31, 2020 12:26 pmCan you please tell me how to resolve the present conflict in nutshell? What should I do?

I think that I should withdraw my pull request, start over from the current merged version, and submit a new pull request later that incorporates the current version.

I have submitted a new pull request to the Github master. It has the same modifications as before ( http://hmgforum.com/viewtopic.php?f=5&t=6607 ), and some new modifications too ( http://hmgforum.com/viewtopic.php?f=35&t=6666 ), all without conflict with the current Github version. I don't think there are any conflicts with the other two pending pull requests.