Conflict resolution merge commit seems incomplete
- by kayaker243
There was a feature branch with conflicts. These were resolved and the resolution committed.
Unfortunately, I botched the merge and a couple previously-released features regressed - this is verified by doing a diff between the merge commit sha1 and that of the previous tag.
When I do git show <sha1 for merge commit> all changes are…