merge-strategy

GitLab - ignore specific files in target branch

浪尽此生 提交于 2019-12-08 04:28:20
问题 I am using GitLab in my project and I have a quite specific workflow. I have 2 branches " Dev " and " Release " as shown below. When I submit a merge request from Dev to Release, the config files are also getting overwritten with that of Dev branch. But ideally config files have to be different for both of these branches. I tried to use merge=ours . But it didn't serve my purpose as it will not override until and unless there is a conflict in config files. I don't want to add these files in

GitLab - ignore specific files in target branch

只愿长相守 提交于 2019-12-08 04:03:24
I am using GitLab in my project and I have a quite specific workflow. I have 2 branches " Dev " and " Release " as shown below. When I submit a merge request from Dev to Release, the config files are also getting overwritten with that of Dev branch. But ideally config files have to be different for both of these branches. I tried to use merge=ours . But it didn't serve my purpose as it will not override until and unless there is a conflict in config files. I don't want to add these files in .gitignore , as any changes to these files will not be committed in Dev branch. Can someone please guide