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!!!
-
Relationship between branches MVP - #3956
- Compare my work to any branch
- Merge in any other branch to my branch
- Relationship between branches continued - #2639
- Notifications around diverging from master branch
- Detect merge conflicts
- Move unpublished commits on master to new branch - #1021
- Don't let me commit to branches I shouldn't commit to
- Guide me to creating my own branches
Note: depending on things, this might get combined with 1.5
- Better onboarding for new users
- Conflict resolution MVP - #2640
- Differentiate conflicted files from other changed files
- Let me choose my mergetool
- Let me open my mergetool
- Conflict resolution continued - #2640
- Edit inline
- Abort merge
- How did I get here?
- Don't let me commit a file with conflict markers
-
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