From 63edf8cb4cf0d7abc0e272b0cb7a17f80a5c8509 Mon Sep 17 00:00:00 2001 From: Aaron Schrab Date: Fri, 22 Mar 2013 13:25:44 -0400 Subject: [PATCH] Swap parents of final commit in intro/3 level goal Change the order of parents of the final commit in the goal of the level intro/3 to match the history produced by the expected solution. Although either order is accepted the new, consistent order of parents is the more idiomatic one merging a bugFix into master rather than master into bugFix. Actually producing the old goal would require more commands. Even though ordering of parents is too advanced of a topic to be covered this early, it would be nice to keep that consistent. --- src/levels/intro/3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/levels/intro/3.js b/src/levels/intro/3.js index 06bad731..e31d4ce5 100644 --- a/src/levels/intro/3.js +++ b/src/levels/intro/3.js @@ -1,5 +1,5 @@ exports.level = { - "goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C4\",\"id\":\"master\"},\"bugFix\":{\"target\":\"C2\",\"id\":\"bugFix\"}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C2\",\"C3\"],\"id\":\"C4\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}", + "goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C4\",\"id\":\"master\"},\"bugFix\":{\"target\":\"C2\",\"id\":\"bugFix\"}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C3\",\"C2\"],\"id\":\"C4\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}", "solutionCommand": "git checkout -b bugFix;git commit;git checkout master;git commit;git merge bugFix", "name": { "en_US": "Merging in Git",