Skip to content

Instantly share code, notes, and snippets.

View dhernandez-stratio's full-sized avatar

David Hernández Martín dhernandez-stratio

View GitHub Profile
@dhernandez-stratio
dhernandez-stratio / level7.json
Created February 13, 2020 16:43
learngitbranching.js.org - Gitflow - Level 7
{
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C8\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develop\":{\"target\":\"C8\",\"id\":\"develop\",\"remoteTrackingBranchID\":null}},\"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\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C3\",\"C4\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"},\"C7\":{\"parents\":[\"C6\"],\"id\":\"C7\"},\"C8\":{\"parents\":[\"C7\"],\"id\":\"C8\"}},\"tags\":{\"1.0.0\":{\"target\":\"C7\",\"id\":\"1.0.0\"},\"1.0.1\":{\"target\":\"C8\",\"id\":\"1.0.1\"}},\"HEAD\":{\"target\":\"develop\",\"id\":\"HEAD\"}}",
"solutionCommand": "git checkout master;git checkout -b hf/a;git commit;git checkout master;git merge hf/a;git tag 1.0.1;git checkout develop;git merge hf/a;git branch -D hf/a",
"startTree": "{\"branches\":{\"master\":{\"target\
@dhernandez-stratio
dhernandez-stratio / level6.json
Created February 13, 2020 16:30
learngitbranching.js.org - Gitflow - Level 6
{
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C7\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develop\":{\"target\":\"C7\",\"id\":\"develop\",\"remoteTrackingBranchID\":null}},\"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\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C3\",\"C4\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"},\"C7\":{\"parents\":[\"C6\"],\"id\":\"C7\"}},\"tags\":{\"1.0.0\":{\"target\":\"C7\",\"id\":\"1.0.0\"}},\"HEAD\":{\"target\":\"develop\",\"id\":\"HEAD\"}}",
"solutionCommand": "git checkout master;git merge rel/ab;git tag 1.0.0;git checkout develop;git merge rel/ab;git branch -D feature/a;git branch -D feature/b;git branch -D fix/ab;git branch -D rel/ab",
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develo
@dhernandez-stratio
dhernandez-stratio / level5.json
Created February 13, 2020 16:01
learngitbranching.js.org - Gitflow - Level 5
{
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develop\":{\"target\":\"C5\",\"id\":\"develop\",\"remoteTrackingBranchID\":null},\"feature/a\":{\"target\":\"C4\",\"id\":\"feature/a\",\"remoteTrackingBranchID\":null},\"feature/b\":{\"target\":\"C3\",\"id\":\"feature/b\",\"remoteTrackingBranchID\":null},\"rel/ab\":{\"target\":\"C7\",\"id\":\"rel/ab\",\"remoteTrackingBranchID\":null},\"fix/ab\":{\"target\":\"C7\",\"id\":\"fix/ab\",\"remoteTrackingBranchID\":null}},\"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\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C3\",\"C4\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"},\"C7\":{\"parents\":[\"C6\"],\"id\":\"C7\"}},\"tags\":{},\"HEAD\":{\"target\":\"rel/ab\",\"id\":\"HEAD\"}}",
"solutionCommand": "git checkout
@dhernandez-stratio
dhernandez-stratio / level4.json
Created February 13, 2020 15:32
learngitbranching.js.org - Gitflow - Level 4
{
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develop\":{\"target\":\"C5\",\"id\":\"develop\",\"remoteTrackingBranchID\":null},\"feature/a\":{\"target\":\"C4\",\"id\":\"feature/a\",\"remoteTrackingBranchID\":null},\"feature/b\":{\"target\":\"C3\",\"id\":\"feature/b\",\"remoteTrackingBranchID\":null},\"rel/ab\":{\"target\":\"C5\",\"id\":\"rel/ab\",\"remoteTrackingBranchID\":null}},\"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\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C3\",\"C4\"],\"id\":\"C5\"}},\"tags\":{},\"HEAD\":{\"target\":\"rel/ab\",\"id\":\"HEAD\"}}",
"solutionCommand": "git checkout -b rel/ab",
"name": {
"en_US": "Preparing the release"
},
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchI
@dhernandez-stratio
dhernandez-stratio / level3.json
Created February 13, 2020 13:06
learngitbranching.js.org - Gitflow - Level 3
{
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develop\":{\"target\":\"C5\",\"id\":\"develop\",\"remoteTrackingBranchID\":null},\"feature/a\":{\"target\":\"C4\",\"id\":\"feature/a\",\"remoteTrackingBranchID\":null},\"feature/b\":{\"target\":\"C3\",\"id\":\"feature/b\",\"remoteTrackingBranchID\":null}},\"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\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C3\",\"C4\"],\"id\":\"C5\"}},\"tags\":{},\"HEAD\":{\"target\":\"develop\",\"id\":\"HEAD\"}}",
"solutionCommand": "git checkout develop;git merge feature/a;git merge feature/b",
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develop\":{\"target\":\"C1\",\"id\":\"develop\",\"remoteTrackingBranchID\":null},\"f
@dhernandez-stratio
dhernandez-stratio / level2.json
Created February 13, 2020 12:32
learngitbranching.js.org - Gitflow - Level 2
{
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develop\":{\"target\":\"C1\",\"id\":\"develop\",\"remoteTrackingBranchID\":null},\"feature/a\":{\"target\":\"C4\",\"id\":\"feature/a\",\"remoteTrackingBranchID\":null},\"feature/b\":{\"target\":\"C3\",\"id\":\"feature/b\",\"remoteTrackingBranchID\":null}},\"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\"],\"id\":\"C4\"}},\"tags\":{},\"HEAD\":{\"target\":\"feature/a\",\"id\":\"HEAD\"}}",
"solutionCommand": "git commit;git checkout develop;git checkout -b feature/b;git commit;git checkout feature/a;git commit",
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develop\":{\"target\":\"C1\",\"id\":\"develop\",\"remoteTrackingBranchID\":null},\"feature/
@dhernandez-stratio
dhernandez-stratio / level1.json
Last active February 13, 2020 14:08
learngitbranching.js.org - Gitflow - Level 1
{
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develop\":{\"target\":\"C1\",\"id\":\"develop\",\"remoteTrackingBranchID\":null},\"feature/a\":{\"target\":\"C1\",\"id\":\"feature/a\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"tags\":{},\"HEAD\":{\"target\":\"feature/a\",\"id\":\"HEAD\"}}",
"solutionCommand": "git branch develop;git branch feature/a;git checkout feature/a",
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"tags\":{},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",
"name": {
"en_US": "Default Gitflow Branching"
},
"hint": {
"en_US": null
},