Resolve merge conflicts through the web interface.

[cirosantilli]

If GitHub wants to be usable by non-programmers, this is a must.

I want this to help non-programmers to write books on GitHub as in https://github.com/booktree/booktree

Seems possible with the GitHub client: https://help.github.com/articles/resolving-merge-conflicts , but this should be doable from the web UI: requiring people to download things is a huge turn off.

Possible implementation: a per file ours / theirs / actual view like Penflip does:

GitLab accepting pull requests: http://feedback.gitlab.com/forums/176466-general/suggestions/5590496-resolve-any-merge-request-conflict-from-the-web-in

I'm considering a Javascript interface that interacts through the API to do that. Does such thing exist already?

[cirosantilli]

Ivan Žužak replied:

Thanks for another neat suggestion! We don't have any short-term plans to provide such a feature, but it is on our feature request list.

Also, as you mentioned in the issue -- using the API should allow you to build a web app that helps with resolving merge conflicts. I haven't tried building anything like that myself before, though. :)

[erkinalp]

🚚

[gbinal]

Just throwing out a +1 on this. It would go a ways in my efforts to get newbies using GitHub.

[cirosantilli]

@gbinal What is your use case? Who are your intended users?

[TPS]

Perhaps something like Wikipedia's interface for edit conflicts would be useful as a beginning point for the basic merge-conflict interface.

[gregjd]

This would be an enormously helpful feature to have. It would go a long way to making GitHub friendlier to people who are just starting to use it.

[cirosantilli]

Done!!! https://github.com/blog/2293-resolve-simple-merge-conflicts-on-github

[akostadinov]

wow, saves a lot of effort for simple conflicts

FYI everybody, you can add more than one reaction - e.g. I added +1 to all - hearth, thumb up, smile and hooray emojis at the same time.

[probonopd]

Not really... button is not showing up. probonopd/Stacer#3