Added merge conflicts iteration to roadmap

amiri27 · Dec 11, 2018 · ae18a20 · ae18a20
1 parent 67816cd
commit ae18a20
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/docs/process/roadmap.md b/docs/process/roadmap.md
@@ -7,6 +7,11 @@ The following are the larger areas of upcoming work the GitHub Desktop team inte
 - Improve onboarding for new users: [#5686](https://github.com/desktop/desktop/issues/5686)
 - Measuring success: [#5549](https://github.com/desktop/desktop/issues/5549) + usability testing
 
+#### Merge conflicts iteration
+
+- Iterate on initial merge conflicts ship: [#6213](https://github.com/desktop/desktop/issues/6213)
+- Measuring success: [#6388](https://github.com/desktop/desktop/issues/6388)
+
 #### Support rebase workflows
 
 - Improve rebase workflows: [#5953](https://github.com/desktop/desktop/issues/5953)