Fixes Issue #7

This commit is contained in:
Peter Cottle 2013-02-16 15:35:08 -08:00
parent 168852b293
commit 19792440f8
10 changed files with 78 additions and 3 deletions

View file

@ -3,6 +3,9 @@ exports.level = {
"solutionCommand": "git checkout -b bugFix;git commit;git checkout master;git commit;git merge bugFix",
"name": "Merging in Git",
"hint": "Remember to commit in the order specified (bugFix before master)",
"disabledMap" : {
"git revert": true
},
"startDialog": {
"childViews": [
{