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
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

2,008 views 1 5
Read article

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