How does stash generate diff for conflict resolution?

We're currently using crucible but are evaluating stash, when a merge results in conflicts we upload the conflict resolution as a pre-commit generated by git show -m --no-prefix -w -U20 {merge-commit} -- {list of conflicted files}. 

We use -m so that we can review whether or not the merger kept the correct conflicting version (by default git show / git diff excludes conflicts where one of the conflicting versions was kept without other alterations).

How does stash deal with or avoid this situation in a pull request?

1 answer

I guess that this isn't so relevant as rather than reviewing the diff between the branch point and the branch head like in crucible, stash reviews the diff between the branch point head and the target branch head.

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

23,237 views 26 12
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you