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

Stash does not show every merge conflict?

Nikolett Molnár
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!
July 7, 2022

Hello,

I use Stash v7.18.2 and git 2.33.1 64 bit.

A month ago, I merged my release branch into the master branch with more than 25 conflicts in one pull request. I used stash to look for the files that have conflicts and resolved the conflicted files. However, Stash did not show all of them, only git did. I did not realized that Stash did not list every conflicted file, but I resolved every conflicting file that Stash showed me, then I committed and merged the branch. After merging it turned out that there are more merge conflicts which cause a problem in our code.

I have 2 questions:

1. Why Stash did not show every merge conflicts? There was too many conflicting files?

2. Why Stash let me do the merge even though there were conflicts in the code? (there was no merge button until I committed the resolved files. After commit, it looked like everything is okay and there is no more conflicts. So it falsely showed no conflicts.)

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events