kennethgeerts

Squashing commits on a feature branch

Suppose you did 3 commits on a feature branch called feature:

ae1a4a5 Foo
a5827db Bar
62d4c80 Baz

Make sure develop branch is up to date:

kennethgeerts

Keybase proof

I hereby claim:

• I am kennethgeerts on github.
• I am kennethgeerts (https://keybase.io/kennethgeerts) on keybase.
• I have a public key ASDyw5dQvQVDdPy6Ls2nxFPUi9y4auOtdaP2Vkb1HA1ytgo

To claim this, I am signing this object:

kennethgeerts

require 'tty-prompt'
require 'colorize'
NAMES = %w[Vera Willy Nele Tim Jules Katrien Kenneth Joris Lien].shuffle
PLACES = ['in de living', 'in de keuken', 'in de hal', 'in een badkamer', 'in de eetkamer', 'in een slaapkamer boven', 'in de speelkamer', 'op de trap', 'rond het huis'].shuffle
WEAPONS = ['de kerstworst', 'Winnie The Pooh', 'de shampoo', 'het kaske van den tv', 'de kolenschop', 'het kussen', 'de voetbal', 'de wc-rol', 'de pollepel']
File.open('gotcha.txt', 'w') { |file| file.puts(NAMES, '-', PLACES, '-', WEAPONS) }
loop do
  100.times { puts }
  puts 'Welkom op de De Mulder-weekend-GOTCHA!'.magenta, ''
  input = TTY::Prompt.new.ask('Wat is je naam?') { |q| q.modify(:trim, :capitalize) }