Created
February 12, 2024 14:38
-
-
Save pomeh/372ba1f3255ed5b76a284c2a5f75a473 to your computer and use it in GitHub Desktop.
learngitbranching test
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ | |
"goalTreeString": "%7B%22branches%22%3A%7B%22main%22%3A%7B%22target%22%3A%22C9%22%2C%22id%22%3A%22main%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%221-feature%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%221-feature%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%222-fix%22%3A%7B%22target%22%3A%22C5%22%2C%22id%22%3A%222-fix%22%2C%22remoteTrackingBranchID%22%3Anull%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C6%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C8%22%3A%7B%22parents%22%3A%5B%22C3%22%2C%22C5%22%5D%2C%22id%22%3A%22C8%22%7D%2C%22C6%27%22%3A%7B%22parents%22%3A%5B%22C8%22%5D%2C%22id%22%3A%22C6%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C6%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%2C%22C9%22%3A%7B%22parents%22%3A%5B%22C7%27%22%2C%22C8%22%5D%2C%22id%22%3A%22C9%22%7D%7D%2C%22tags%22%3A%7B%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22main%22%2C%22id%22%3A%22HEAD%22%7D%7D", | |
"solutionCommand": "git switch main;git merge --no-ff 2-fix;git switch 1-feature;git rebase main;git switch -;git merge --no-ff 1-feature", | |
"startTree": "{\"branches\":{\"main\":{\"target\":\"C3\",\"id\":\"main\",\"remoteTrackingBranchID\":null},\"1-feature\":{\"target\":\"C7\",\"id\":\"1-feature\",\"remoteTrackingBranchID\":null},\"2-fix\":{\"target\":\"C5\",\"id\":\"2-fix\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C3\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C4\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C3\"],\"id\":\"C6\"},\"C7\":{\"parents\":[\"C6\"],\"id\":\"C7\"}},\"tags\":{},\"HEAD\":{\"target\":\"1-feature\",\"id\":\"HEAD\"}}", | |
"name": { | |
"en_US": "Git flow merges with semi-linear history" | |
}, | |
"hint": { | |
"en_US": "Don't use fast forward during merge operation" | |
}, | |
"startDialog": { | |
"en_US": { | |
"childViews": [ | |
{ | |
"type": "ModalAlert", | |
"options": { | |
"markdowns": [ | |
"# Objective", | |
"", | |
"Merge both `2-fix` and `1-feature` branches, in this order, with a semi-linear history." | |
] | |
} | |
} | |
] | |
} | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment