Details
-
Suggestion
-
Resolution: Unresolved
-
None
-
None
Description
When delivering a resolution to a conflict there is no indication as to how the conflict was resolved. Knowing how the conflict was resolved is pretty essential in whether or not the pull request should be approved or denied.
example -
Merge branch 'test' into origin
- Conflicts:
- # x/models/x.slx
- # x/models/x
- # x/models/x.slx