{"thread":{"id":"40507","subject":"Exclude a file from a pull request‏","startedAt":"2015-10-07T15:55:18Z","lastAt":"2015-10-08T00:30:07Z","messageCount":3,"participants":["Rudy YAYON","Andreas Schwab","Jacob Keller"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"271259","messageId":"88A9B78851BE8145A87C05C88FC3ED840101DEB1@bsrspdag001.boursorama.fr","threadId":"40507","inReplyTo":null,"subject":"Exclude a file from a pull request‏","fromName":"Rudy YAYON","fromEmail":"rudy.yayon.ext@boursorama.fr","sentAt":"2015-10-07T15:55:18Z","receivedAt":"2015-10-07T15:55:18Z","isPatch":false,"sender":{"key":"rudy.yayon.ext@boursorama.fr","avatar":null},"body":"Hi all,\n \n  I have a concern with r10k used by Puppet.\n  r10k is a Puppet tool based on the git workflow.\n \n  My concern is that one important file (Puppetfile) needs to be pushed to my remote repository so I can check the changes I commited.\n  To do that, I need to commit changes (included to the Puppetfile) then I need to push it to the remote repository.\n \n  Once I want to merge these changes from a specific branch to the master branch, I do NOT want to include this file. In other words, I want to merge all files except the Puppetfile file.\n \n  What is the best way for you to do that?\n \nReminder: I can't ignore the file as I have to push it to the remote repository (origin) \n\nRegards,\nRudy YAYON\n"},{"id":"271261","messageId":"87oaga8wq6.fsf@igel.home","threadId":"40507","inReplyTo":"88A9B78851BE8145A87C05C88FC3ED840101DEB1@bsrspdag001.boursorama.fr","subject":"Re: Exclude a file from a pull request‏","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2015-10-07T16:33:21Z","receivedAt":"2015-10-07T16:33:21Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Rudy YAYON <Rudy.YAYON.ext@boursorama.fr> writes:\n\n>   My concern is that one important file (Puppetfile) needs to be pushed to my remote repository so I can check the changes I commited.\n>   To do that, I need to commit changes (included to the Puppetfile) then I need to push it to the remote repository.\n>  \n>   Once I want to merge these changes from a specific branch to the master branch, I do NOT want to include this file. In other words, I want to merge all files except the Puppetfile file.\n>  \n>   What is the best way for you to do that?\n\nCreate a branch that does not include the file.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"271290","messageId":"CA+P7+xqZwbLkLhG=1PvBXSRW_bJ_7CphTJDAY3Wrc1SyjCFsaA@mail.gmail.com","threadId":"40507","inReplyTo":"87oaga8wq6.fsf@igel.home","subject":"Re: Exclude a file from a pull request‏","fromName":"Jacob Keller","fromEmail":"jacob.keller@gmail.com","sentAt":"2015-10-08T00:30:07Z","receivedAt":"2015-10-08T00:30:07Z","isPatch":false,"sender":{"key":"jacob.keller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/874719?v=4"},"body":"On Wed, Oct 7, 2015 at 9:33 AM, Andreas Schwab <schwab@linux-m68k.org> wrote:\n> Rudy YAYON <Rudy.YAYON.ext@boursorama.fr> writes:\n>\n>>   My concern is that one important file (Puppetfile) needs to be pushed to my remote repository so I can check the changes I commited.\n>>   To do that, I need to commit changes (included to the Puppetfile) then I need to push it to the remote repository.\n>>\n>>   Once I want to merge these changes from a specific branch to the master branch, I do NOT want to include this file. In other words, I want to merge all files except the Puppetfile file.\n>>\n>>   What is the best way for you to do that?\n>\n> Create a branch that does not include the file.\n>\n> Andreas.\n>\n\nWhy do the changes to \"Puppetfile\" need to be pushed to your github?\nJust test it locally and then push it and pull-request a commit which\ndoesn't have those changes in it.\n\nRegards,\nJake\n"}]}