{"thread":{"id":"39642","subject":"GitHub Pull Request merge commands","startedAt":"2015-06-16T08:55:07Z","lastAt":"2015-06-16T09:33:45Z","messageCount":2,"participants":["Florian Lindner","Johannes Löthberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"263918","messageId":"mloo9l$agl$6@ger.gmane.org","threadId":"39642","inReplyTo":null,"subject":"GitHub Pull Request merge commands","fromName":"Florian Lindner","fromEmail":"mailinglists@xgm.de","sentAt":"2015-06-16T08:55:07Z","receivedAt":"2015-06-16T08:55:07Z","isPatch":false,"sender":{"key":"mailinglists@xgm.de","avatar":null},"body":"Hello,\n\nGitHub proposes these commands to merge a pull requests (explanations from \nme, to make sure I got it correctly)\n\n# Basically branch develop to davidsblom-develop\ngit checkout -b davidsblom-develop develop\n\n# Pull in foreign repos commits from foreign develop branch.\ngit pull git://github.com/davidsblom/precice.git develop\n\n# Edit and merge the changes to the main repos develop branch\ngit checkout develop\ngit merge --no-ff davidsblom-develop\ngit push origin develop\n\nMy question is, if davidsblom make further commits to his develop branch \n(after the pull request was issued) aren't these commits also included in \nthe pull and therefore in the merge? If yes, isn't the idea to merge just \nthe changes that the pull request was about? If not, why? ;-)\n\nThanks,\nFlorian\n"},{"id":"263919","messageId":"20150616093345.GA28617@leeloo.kyriasis.com","threadId":"39642","inReplyTo":"mloo9l$agl$6@ger.gmane.org","subject":"Re: GitHub Pull Request merge commands","fromName":"Johannes Löthberg","fromEmail":"johannes@kyriasis.com","sentAt":"2015-06-16T09:33:45Z","receivedAt":"2015-06-16T09:33:45Z","isPatch":false,"sender":{"key":"johannes@kyriasis.com","avatar":"https://gravatar.com/avatar/af2dea1b1759403329a1b7eaa28a07b5c5d1901e9f55723103d6324ffb7737ae?d=mp&s=160"},"body":"On 16/06, Florian Lindner wrote:\n>My question is, if davidsblom make further commits to his develop branch\n>(after the pull request was issued) aren't these commits also included in\n>the pull and therefore in the merge? If yes, isn't the idea to merge just\n>the changes that the pull request was about? If not, why? ;-)\n>\n\nA pull request is \"about\" all commits in the branch, which is why \ntopic-branches should be used for PRs.\n\n-- \nSincerely,\n  Johannes Löthberg\n  PGP Key ID: 0x50FB9B273A9D0BB5\n  https://theos.kyriasis.com/~kyrias/\n"}]}