threads / discuss / 40507

Exclude a file from a pull request‏

Subject: Exclude a file from a pull request‏

## tl;dr

3 messages between Oct 7, 2015 and Oct 8, 2015.

replies: 2people: 3as markdown or json

Rudy YAYON· Oct 7, 2015, 15:55 UTC · lore

Hi all,
 
  I have a concern with r10k used by Puppet.
  r10k is a Puppet tool based on the git workflow.
 
  My concern is that one important file (Puppetfile) needs to be pushed to my remote repository so I can check the changes I commited.
  To do that, I need to commit changes (included to the Puppetfile) then I need to push it to the remote repository.
 
  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.
 
  What is the best way for you to do that?
 
Reminder: I can't ignore the file as I have to push it to the remote repository (origin)

Regards, Rudy YAYON

Andreas Schwab· Oct 7, 2015, 16:33 UTC · re: Rudy YAYON · lore

Re: Exclude a file from a pull request‏

Rudy YAYON <Rudy.YAYON.ext@boursorama.fr> writes:

Show 6 quoted lines

>   My concern is that one important file (Puppetfile) needs to be pushed to my remote repository so I can check the changes I commited.
>   To do that, I need to commit changes (included to the Puppetfile) then I need to push it to the remote repository.
>  
>   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.
>  
>   What is the best way for you to do that?

Create a branch that does not include the file.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Jacob Keller· Oct 8, 2015, 00:30 UTC · re: Andreas Schwab · lore

Re: Exclude a file from a pull request‏

On Wed, Oct 7, 2015 at 9:33 AM, Andreas Schwab <schwab@linux-m68k.org> wrote:

Show 13 quoted lines

> Rudy YAYON <Rudy.YAYON.ext@boursorama.fr> writes:
>
>>   My concern is that one important file (Puppetfile) needs to be pushed to my remote repository so I can check the changes I commited.
>>   To do that, I need to commit changes (included to the Puppetfile) then I need to push it to the remote repository.
>>
>>   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.
>>
>>   What is the best way for you to do that?
>
> Create a branch that does not include the file.
>
> Andreas.
>

Why do the changes to "Puppetfile" need to be pushed to your github? Just test it locally and then push it and pull-request a commit which doesn't have those changes in it.

Regards, Jake