Hey Dan, Thank you for your response. Yeah, I've tried the solution presented in the links you provided, but it doesn't work in GitLab environment... and it seems that I am mot alone with this problem: https://forum.gitlab.com/t/gitlab-enable-merge-driver-and-configure-gitattributes-exclude-file-folders-on-merge-request/8254
I suspect that the problem is with the custom merge driver definition.. when we declare it in git (via git config --system merge.ours.driver true) it has no effect on GitLab instance.. So basically I am struggling to get it to work in GitLab not in 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 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 merge which is not desired because Masters' pipeline in > Jenkins will then look exactly the same as for Development branch. > > Thanks, > > Alex > -- You received this message because you are subscribed to the Google Groups "GitLab" group. To unsubscribe from this group and stop receiving emails from it, send an email to gitlabhq+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/gitlabhq/1db66fb9-7f58-496f-8165-883ac26b9f8e%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
