Skip to content

Instantly share code, notes, and snippets.

View Turysaz's full-sized avatar
⌨️
... *keyboard typing noise*

Turysaz

⌨️
... *keyboard typing noise*
View GitHub Profile
@Turysaz
Turysaz / git-conflicts.sh
Last active March 27, 2023 09:22
Easy git merge conflict resolving
#!/bin/bash
# Git conflict resolving helper
# Show a numbered list of all conflicts with `conflicts-list`.
# Edit any of the conflicting files by `conflicts-edit <index-number>`.
# resolve init
__conflicts-init() {
# read the names of all unmerged files into the array _CONFLICTS
readarray -t _CONFLICTS < <(git diff --name-only --diff-filter=U)
@Turysaz
Turysaz / alternative-battleship-game.md
Last active March 1, 2022 20:12
Rules for a alternative and more complex variant of the "battleship" game

An alternative battleship game

Motivation

I want to create a game that can be played with pen and paper, like the original battleship. Also, it should have that non-abstract setting to it (in contrast to tic-tac-toe, for example). Battleship itself is a good start, but I dislike a couple of things about it: