Potherca
2/28/2018 - 1:13 PM

UK will not be allowed to cherry-pick from European Union trade-deals (A developer perspective).

UK will not be allowed to cherry-pick from European Union trade-deals (A developer perspective).

#!/usr/bin/env bash

set -o errexit
set -o errtrace
set -o nounset
set -o pipefail

# Save screen contents
tput smcup

tput clear

echo -e "$(cat << EOF

  $ mkdir single-market-deal
  $ cd \$_
  $ git init
  Initialized empty Git repository in /home/ukgov/single-market-deal/.git/
  $ git remote add upstream https://github.com/ec-europa/trade-deals
  $ git fetch upstream --quiet
  $ git cherry-pick 'freedom-of-trade' -m1
  error: could not apply e9ec80e71... Merged in drafts/freedom-of-trade (pull request #50)
  hint: after resolving the conflicts, mark the corrected paths
  hint: with 'git add <paths>' or 'git rm <paths>'
  hint: and commit the result with 'git commit'
  $ git status
  On branch master
  You are currently cherry-picking commit e9ec80e71.
    (fix conflicts and run "git cherry-pick --continue")
    (use "git cherry-pick --abort" to cancel the cherry-pick operation)

  Unmerged paths:
    (use "git add/rm <file>..." as appropriate to mark resolution)

  	deleted by us:   international-agreements/freedom-of-trade.txt

  no changes added to commit (use "git add" and/or "git commit -a")
  $ vi international-agreements/freedom-of-trade.txt
  $ git status
  On branch master
  You are currently cherry-picking commit e9ec80e71.
    (all conflicts fixed: run "git cherry-pick --continue")
    (use "git cherry-pick --abort" to cancel the cherry-pick operation)

  Changes to be committed:

  	new file:   international-agreements/freedom-of-trade.txt

  $ git cherry-pick --continue
  error: $(tput setab 1) cherry-pick not allowed by the EU $(tput sgr0)
  fatal: cherry-pick failed

_
EOF
)"

read -n 1 whatever

# Restore screen contents
tput rmcup

Recently, an acquaintance showed me this tweet by Alex Taylor:

Being a programmer, we were both strongly reminded of the git cherry-pick command.

For us this basically reads like this: