Missed Team ’24? Catch up on announcements here.

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

Automatic merge failure holding other pull requests also into target branch

Venkata Sudheer Kumar (Sudheer) Muppa
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!
February 1, 2018

When we got the automatic merge failure from one branch to newer branch , Stash is opening a new pull request . This is very nice, But same pull request holding other changes also which doesnt have conflicts.

 example:

  branch 1 

 branch 2

 

steps

1) developer one : committed code to branch 1 via pull request  and its propagated to branch 2 as i enabled automatic merge.

2) we got automatic merge failure and opened new pull request by stash.

 

developer 2 merged a new pull request to branch 1 with different set of files and those are merged in branch 1, But its appending to automatic merge failure pull request for branch 2.

 

as these are different files we should not stop  to merge/propagate to branch 2 as the files done by developer 2 and not having conflicts .

 

Can anyone help to resolve the issue ? only conflict files should hold or conflict pull request should hold in propagation/automatic merge branch failure pull request .

 

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events