Switch branches/tags
release-1.3.0-beta2 release-1.3.0-beta1 release-1.2.7-beta0 release-1.2.6 release-1.2.6-beta0 release-1.2.5 release-1.2.4 release-1.2.4-beta5 release-1.2.4-beta4 release-1.2.4-beta3 release-1.2.4-beta2 release-1.2.4-beta1 release-1.2.3 release-1.2.3-beta1 release-1.2.2 release-1.2.2-beta1 release-1.2.1 release-1.2.1-beta1 release-1.2.1-beta0 release-1.2.0 release-1.1.2-beta7 release-1.1.2-beta6 release-1.1.2-beta5 release-1.1.2-beta4 release-1.1.2-beta3 release-1.1.2-beta2 release-1.1.2-beta1 release-1.1.1 release-1.1.1-beta4 release-1.1.1-beta3 release-1.1.1-beta2 release-1.1.1-beta1 release-1.1.0 release-1.1.0-beta3 release-1.1.0-beta2 release-1.1.0-beta1 release-1.0.14-beta5 release-1.0.14-beta4 release-1.0.14-beta3 release-1.0.14-beta2 release-1.0.14-beta1 release-1.0.13 release-1.0.13-beta1 release-1.0.12 release-1.0.12-beta1 release-1.0.12-beta0 release-1.0.11 release-1.0.11-beta0 release-1.0.10 release-1.0.10-beta3 release-1.0.10-beta2 release-1.0.10-beta1 release-1.0.10-beta0 release-1.0.9 release-1.0.9-beta1 release-1.0.9-beta0 release-1.0.8 release-1.0.8-beta0 release-1.0.7 release-1.0.7-beta0 release-1.0.6 release-1.0.5 release-1.0.5-beta1 release-1.0.5-beta0 release-1.0.4 release-1.0.4-beta1 release-1.0.4-beta0 release-1.0.3 release-1.0.2 release-1.0.2-beta1 release-1.0.2-beta0 release-1.0.1 release-1.0.1-beta0 release-1.0.0 release-1.0.0-beta3 release-1.0.0-beta1 release-1.0.0-beta0 release-0.9.1 release-0.8.2 release-0.8.1 release-0.8.1-beta4 release-0.8.1-beta3 release-0.8.1-beta2 release-0.8.1-beta1 release-0.8.1-beta0 release-0.8.0 release-0.7.3-beta5 release-0.7.3-beta4 release-0.7.3-beta3 release-0.7.3-beta2 release-0.7.3-beta1 release-0.7.3-beta0 release-0.7.2 release-0.7.2-beta0 release-0.7.1 release-0.7.1-beta5 release-0.7.1-beta4 release-0.7.1-beta3 release-0.7.1-beta2 release-0.7.1-beta1
Nothing to show
Find file Copy path
e167d6f Mar 3, 2018
@joshaber @nerdneha @iAmWillShepherd @shiftkey @j-f1
57 lines (38 sloc) 2.62 KB


The following are our marketing releases, as planned to date (and we plan to revisit 6 months from now). They contain the broad features we're considering. The further away a release is, the less defined it is. Releases are subject to change at any time. This is not written in stone!!!

1.2 - Relationship between branches MVP

1.3 - Detecting merge conflicts

1.4 - New branch, maybe?

Note: depending on things, this might get combined with 1.5

1.5 - Better onboarding

  • Better onboarding for new users

1.6 - Conflict awareness

  • Conflict resolution MVP - #2640
    • Differentiate conflicted files from other changed files
    • Let me choose my mergetool
    • Let me open my mergetool

1.7 - Conflict resolution

1.8 - Messaging + Tracking

  • End of Progress & in-app messaging

    • End of Progress: Providing friendly update when longer running processes are complete
    • In-app Message: providing success/failure notifications for unclear interactions (ex: login)
  • App interaction tracking

    • Adding in analytics around features we need data on
    • (optional) Clarifying what data we collect if people opt-in, potentially adding other opt-in options for different levels of data
    • (optional) Surfacing data collected back to user
  • View changes by methods and functions (for supported files)