We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
The iteration meeting on 5/21 included a demo of resolving a merge conflict by @Myoldmopar.