On Tue, Mar 27, 2018 at 3:42 PM, Alex Ignatov <alex.o.igna...@gmail.com> wrote: > 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.
There's an app for that. Wait, no, there's a git attribute for that. See https://stackoverflow.com/questions/9264701/gitattributes-merge-strategy I've never tried it, thank you for asking an interesting question. I assume it works regardless of which git repo you're using. -- 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-yOawSKAAWwMLRr0-Daq12aA6-MRPDGLSZiK2cW-0XaL1EQ%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
