Re: [git-users] Adding a pull request (newer master) to my build

2017-08-12 Thread Michael
On 2017-08-12, at 12:50 AM, Philip Oakley wrote: > Michael, > > If that master and the PR979 branches have been merged and both tips are now > ahead of the merge point, then git itself has no way of deciding which side > of the merge is which. [you hadn't labelled your

Re: [git-users] Adding a pull request (newer master) to my build

2017-08-12 Thread Philip Oakley
Michael, If that master and the PR979 branches have been merged and both tips are now ahead of the merge point, then git itself has no way of deciding which side of the merge is which. [you hadn't labelled your diagram] That is, git doesn't keep a note of which side would have been the first and