Exclude certain files on merge

2018-03-27 Thread Alex Ignatov
Hello, Wondering if it is possible to not merge specific file while merging the whole project from let's say a development branch to Master? The reason behind this question is Jenkinsfile that I want to keep separate for each branch. Current behavior is that this file will be overwritten upon

Re: Exclude certain files on merge

2018-03-28 Thread Alex Ignatov
git. Any ideas how to configure this custom driver in GitLab? On Tuesday, March 27, 2018 at 4:42:40 PM UTC-6, Alex Ignatov wrote: > > Hello, > > Wondering if it is possible to not merge specific file while merging the > whole project from let's say a development branch to Mast