mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-10 14:44:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolves #769 -- updates solution commands and fixes a TON more bugs with the master to main renaming

Browse source
This commit is contained in:
Peter Cottle 2021-01-01 14:20:05 -07:00
parent 592860ea10
commit a08fa94e92
22 changed files with 56 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/levels/intro/merging.js
View file

@ -1,6 +1,6 @@
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\":[\"C3\",\"C2\"],\"id\":\"C4\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",
"solutionCommand": "git checkout -b bugFix;git commit;git checkout master;git commit;git merge bugFix",
"solutionCommand": "git checkout -b bugFix;git commit;git checkout main;git commit;git merge bugFix",
"name": {
"en_US": "Merging in Git",
"de_DE": "Mergen in Git",