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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root


1 badge earned


Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!


Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.


Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!


Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
Community Members
Community Events
Community Groups

Stash does not show every merge conflict?


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

Atlassian Community Events