How does stash generate diff for conflict resolution?

Dean Sas

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?

Dean Sas

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.