I'm trying to configure Stash to perform the automatic merges from the release branches when a Pull Request gets merged. The functionality seems nice, but we're stuck in this problem:
The release branch needs some configuration files to be changed every time a build is "released", to reflect the new build version. Therefore we have some automatic commits when a build is released. This will lead to conflicts when merging, though the conflicts are easy to solve since for those specific files the strategy should be "ours". In other words, these files should be ignored during the merge, since they don't apply to the target branch. But how can I configure the automatic merge in Stash to deal with these cases?
Otherwise I don't see how we can benefit from this feature, since this is a common practice to have some files changed related with versioning, in different branches.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.