Switch branches/tags
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 release-0.7.1-beta0 release-0.7.0 release-0.6.3-beta7 release-0.6.3-beta6 release-0.6.3-beta5 release-0.6.3-beta4 release-0.6.3-beta3 release-0.6.3-beta2 release-0.6.3-beta1 release-0.6.3-beta0 release-0.6.2 release-0.6.1 release-0.6.0 release-0.5.9 release-0.5.8 release-0.5.7 release-0.5.6 release-0.5.5 release-0.5.4 release-0.5.3 release-0.5.2 release-0.5.1 release-0.5.0 release-0.0.39 release-0.0.38 release-0.0.37 release-0.0.36 release-0.0.35 release-0.0.34 release-0.0.33 release-0.0.32 release-0.0.31 release-0.0.30 release-0.0.29 release-0.0.28 release-0.0.27 release-0.0.26 release-0.0.25 release-0.0.24 release-0.0.23 release-0.0.22 release-0.0.21 release-0.0.20
Nothing to show
Find file
fbd41db Sep 19, 2017
@joshaber @shiftkey
64 lines (46 sloc) 1.6 KB


The following are our marketing releases as planned to date. 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.


  • Relationship to X

    • Show how the current branch relates to the target branch
    • The target is the default branch or the upstream's default branch
    • Probably let the user switch the target branch
  • Conflict resolution lite

    • Differentiate conflicted files from other changed files
    • Let me choose my mergetool
    • Let me open my mergetool
  • Pull request list

    • Probably a tab in the Branches foldout
    • Group my pull requests vs. others
  • Pull request CI status

    • Show PRs CI status in the above pull request list
  • Auto-config upstreams on fork

    • Create an upstream remote for forks
    • Fetch periodically


  • Full conflict resolution

    • Lots TBD
    • Pick ours/theirs/both
    • Edit inline
    • Abort merge
    • How did I get here?
  • Fork if needed

    • Offer to fork on clone, or push, or ?
  • Protected branches and default branch protection

    • Don't let me commit to branches I shouldn't commit to
    • Guide me to creating my own branches
  • CI status notifications lite

    • Only on my PRs
    • Use OS notifications
    • Notifications link to the PR on dotcom


  • Keep environment up-to-date

    • Do I need to run npm install? bundle install?
    • Is it pluggable?
  • Linting

    • TBD
  • Save face

    • Keep me from making embarrassing mistakes
    • Don't let me commit a file with conflict markers
  • Repository list info

    • Does a repository need my attention?