Here's an example. It's meant to illustrate 2 developers working on a feature branch based on master and one pulls their code in before the other. https://gith

Here's an example. It's meant to illustrate 2 developers working on a feature branch based on master and one pulls their code in before the other. https://github.com/jparmstrong/gittest/pull/3/files https://github.com/jparmstrong/gittest/pull/3/files - Two feature branches were created based on master at the same time. - Branch1: committed a change to readme and it's pulled into master via PR. - Branch2: committed a change to readme, raised a pull request (PR#3), and the diff doesn't show the line that was added with the branch1 pull request. In this example, the PR is telling me there's a conflict and I need to merge master with the PR branch (this is good). What it doesn't tell me is where the conflict is. Solution, merge the base branch into the interim PR branch. The result will show you the conflict and properly represents what would happen if this PR is accepted. (Bitbucket does this) Thanks for following up. gist of merge master example output: https://gist.github.com/jparmstrong/07cab1a566c5c1495d7c8e075dd65962 https://gist.github.com/jparmstrong/07cab1a566c5c1495d7c8e07...