Merge conflict on branch in github

Question

I have 2 files firtst-page.html and first-page.html new lines added to first-page.html file from different branches. While merging results in conflicts and can't revert.. one pull request with following lines

<html>
<body>
<h1>this is master file</h1>
who is this
</body>
</html>

another pull request with

<html>
<body> 
<h1>this is master file</h1> 
firtst-page firtst-page firtst-page  
</body>
</html>

My questions are

How to resolve this conflict?
Why such conflict?
Do github allow multiple pull request at a time?

I think you should search for 'how to solve conflicts in Git — Luis Filipe, Sep 26 '17 at 16:21
You need to learn the technology you are trying to use. The questions you are asking show you lack a basic understanding of file versioning. — Maciej Jureczko, Sep 26 '17 at 16:44
I saw the answer accepted for a few seconds... anything missing? — VonC, Sep 27 '17 at 08:37

VonC · Accepted Answer · 2017-09-26T19:11:49.133

Every time a file does evolve both in the source branch and the destination branch, there can be conflicts.

More specifically, there will be conflicts on common line with different modified content.

To resolve those conflicts, you can report to "How to resolve merge conflicts in Git?", but you also can, more recently (Dec. 2016), resolve them directly from the GitHub web GUI.
See "Resolve simple merge conflicts on GitHub"

You cannot accept multiple PR without merging them locally first, then making a new PR with the result of that merge (or updating an existing one)

Merge conflict on branch in github

1 Answers1