Anyone resolve or have script to automtic resolve the merge conflict in git/gitlab/github. example: we have development branch, developer is giving the build/code with tag. We should consider this tag as source of trueth. when we are going to merge this tag into master branch with automatic resovle the merge conflict.
Currently, in our scenario we need to manually resovle merge conflict. We need to have solve automatic way