Skip to content

Instantly share code, notes, and snippets.

View AlexandreArpin's full-sized avatar

Alexandre Arpin AlexandreArpin

View GitHub Profile
ActionScript
Ada
Agile
AI
Apex
AppleScript
Architecture
Batchfile
Beer Brewing
Big Data
{
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C8\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"develop\":{\"target\":\"C9\",\"id\":\"develop\",\"remoteTrackingBranchID\":null},\"hotfix\":{\"target\":\"C4\",\"id\":\"hotfix\",\"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\":[\"C1\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C3\",\"C4\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C1\",\"C5\"],\"id\":\"C6\"},\"C7\":{\"parents\":[\"C3\",\"C5\"],\"id\":\"C7\"},\"C8\":{\"parents\":[\"C1\",\"C4\"],\"id\":\"C8\"},\"C9\":{\"parents\":[\"C3\",\"C4\"],\"id\":\"C9\"}},\"tags\":{},\"HEAD\":{\"target\":\"develop\",\"id\":\"HEAD\"}}",
"solutionCommand": "git checkout master;git reset C1;git checkout develop;git reset C3;git checkout hotfix;git reset C4;git checkout master;git merge hotfix --no-ff;git c