GitHub Pull Request merge commands

GitHub Pull Request merge commands

[Florian Lindner]

Hello,

GitHub proposes these commands to merge a pull requests (explanations from 
me, to make sure I got it correctly)

# Basically branch develop to davidsblom-develop
git checkout -b davidsblom-develop develop

# Pull in foreign repos commits from foreign develop branch.
git pull git://github.com/davidsblom/precice.git develop

# Edit and merge the changes to the main repos develop branch
git checkout develop
git merge --no-ff davidsblom-develop
git push origin develop

My question is, if davidsblom make further commits to his develop branch 
(after the pull request was issued) aren't these commits also included in 
the pull and therefore in the merge? If yes, isn't the idea to merge just 
the changes that the pull request was about? If not, why? ;-)

Thanks,
Florian

Re: GitHub Pull Request merge commands

[Johannes Löthberg]

[-- Attachment #1: Type: text/plain, Size: 552 bytes --]

On 16/06, Florian Lindner wrote:
>My question is, if davidsblom make further commits to his develop branch
>(after the pull request was issued) aren't these commits also included in
>the pull and therefore in the merge? If yes, isn't the idea to merge just
>the changes that the pull request was about? If not, why? ;-)
>

A pull request is "about" all commits in the branch, which is why 
topic-branches should be used for PRs.

-- 
Sincerely,
  Johannes Löthberg
  PGP Key ID: 0x50FB9B273A9D0BB5
  https://theos.kyriasis.com/~kyrias/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 1495 bytes --]