On Wed, Mar 28, 2018 at 9:21 AM, Alex Ignatov <alex.o.igna...@gmail.com> wrote: > 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.
Oh, you're merging by clicking the button. Right. I forget that people do that :-) - Dan -- 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/CAPF-yObo79Bd%2BM4MhdEPtpBCVcCCfUwCt-sE-519aiPhAZO9HA%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
