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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
