With the general goal of reducing friction for people collaborating on software, we want to instrument the app to understand the following:

• Given that an attempted merge results in a merge conflict, what percentage of those eventually result in a successful merge?

I think we have attempted merges that result in conflicts, so the missing piece here is to be able to understand whether those conflicts eventually get resolved successfully or whether they're just abandoned. A thing we've heard in user research is people saying some version of, "and then I just had to start over because I couldn't resolve the conflict." We obviously want to avoid this, so understanding how common it is when people do get into conflicts will be helpful in us figuring out whether we're making progress here.

The ideal scenario is that anytime a person attempts to merge code from one branch to another, that they're able to do so successfully.

Tasks

• Create issue in analytics repo: https://github.com/github/analytics/issues/712
• Add metrics to app: Add metrics for completing/aborting a merge after conflicts #5810
• Update metrics documentation Documents new merge success metrics  #5879
• Update marketing site - https://github.com/github/desktop.github.com/pull/119
• Update central - https://github.com/github/central/pull/411
• 🚢

cc: @telliott27