Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

adding new merge strategy

Lukas Polacek
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
August 29, 2023

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?

1 answer

0 votes
Aron Gombas _Midori_
Community Leader
Community Leader
Community Leaders are connectors, ambassadors, and mentors. On the online community, they serve as thought leaders, product experts, and moderators.
August 30, 2023

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.

Lukas Polacek
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
September 7, 2023

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.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events