Git workshop sample for 23-rerere-conflict-reuse
