adding new merge strategy

Question

I have a file "changelog" where in every pull request is added line what was done in the branch and link to ticket in Jira to which it is bound. This results to instant merge conflict while merging to develop branch, because of development in large team and dealing with several pull requests per day. While solving the conflict locally I simple use ort strategy. Is there a possibility to implement this new strategy to resolve it automatically on bitbucket in pull request?

Lukas Polacek · Answer

Thank you for the input. I know that it would be better, But my customer demands this placement. So I am looking for the solution elsewhere.

Aron Gombas _Midori_ · Answer

My first idea is: are you sure it is the best place to keep the "changelog" in the repository?

Why don't you externalize it? For example, instead of appending a line to the file, pass the information to a REST API that writes it a database, Google Spreadsheet or some other external resource. You can then just forget about the problem.