{"thread":{"id":"39108","subject":"[FUN] Conflicting git merge runs for several minutes. (3,5)","startedAt":"2015-04-18T11:41:50Z","lastAt":"2015-04-18T11:41:50Z","messageCount":1,"participants":["Thore Husfeldt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"259625","messageId":"98D6B393-2331-4FC7-BF2F-66CC73826D86@cs.lth.se","threadId":"39108","inReplyTo":null,"subject":"[FUN] Conflicting git merge runs for several minutes. (3,5)","fromName":"Thore Husfeldt","fromEmail":"thore.husfeldt@cs.lth.se","sentAt":"2015-04-18T11:41:50Z","receivedAt":"2015-04-18T11:41:50Z","isPatch":false,"sender":{"key":"thore.husfeldt@cs.lth.se","avatar":null},"body":"For the cruciverbalists in this community, I constructed a cryptic crossword themed for git.\n\nhttp://thorehusfeldt.net/2015/04/03/conflicting-git-merge-runs-for-several-minutes-35/\n\nHere are all the clues:\n\n1 git rebase a ref, keeping the current branch. (11)\n8 It horizontally connects a group of developers that is second rate at heart. (3,4)\n9 Port one good upstream class. (5)\n10 Stash /home with Eclipse, say. (4)\n11 Plumbing in git finally offers interface letting everybody test SHA1 abbreviations. (7)\n13 Better bring changes from the repository into the working copy if you use Subversion. (6)\n14 Announce merge of HEAD in real life. (6)\n17 Repent misguided introduction of DVCS sham. (7)\n19 Git in detached HEAD state at the beginning of checkout is a proverbial irritation. (4)\n22 Rebuke from git-fetch I’d enjoy. (5)\n23 Angry rant about central part of GUI editor reveals having a temperament of a particular kind. (7)\n24 Social gathering attended only by men in French train station: A fundamental git concept. (7,4)\n\nDown\n1 Force print download objects and refs from another repository. (5)\n2 Truly departed, I left and rewrote history. (7)\n3 Pay attention to the editor features. (4)\n4 Romeo to overplay origin, maybe. (6)\n5 Conflicting git merge runs for several minutes. (3,5)\n6 Sounds like the results of a collision, stupid. (5)\n7 Made sense of the syntax, quietly bothered, … (6)\n12 … and replaced caret with revspec’s second symbol, among others. (8)\n13 Carefully analyse git reset --merge after trying to add changes from a specific commit? (6)\n15 He makes changes later re compilation. (7)\n16 Creator accepts first pull on computer, behaving with some degree of autonomy. (6)\n18 Finally committed its changes. (5)\n20 Hardy eccentric used lots of branch heads. (5)\n21 Scandinavian man’s revolutionary version control system. (4)"}]}