Álex Román Núñez EIREXE

I develop a little game called Project Heartbeat.

59 followers · 10 following

EIRTeam
Spain
https://store.steampowered.com/app/1216230/
@eirexe_gazoo

View GitHub Profile

Recently created

Least recently created

Recently updated

Least recently updated

kareemalnoaman / Git_mergetool_tutorial.md

Created February 5, 2020 09:15 — forked from karenyyng/Git_mergetool_tutorial_with_Vim.md

How to use `git mergetool` to resolve conflicts

Table Of Content

Skip to the relevant sections if needed.

2-min tutorial to do it the quick-and-dirty-way
Concepts for resolving Git conflicts
Setting up different editors / tool for using git mergetool
- Finding out what mergetool editors are supported
mergetool simple code example for vimdiff
- Resolving conflict from a Git pull
Other great references and tutorials

poop-person / .POOP.md

Last active January 24, 2025 23:28

POOP: Peacefully Opposing Oppressive Puritanism

POOP is a badge for any software project that is [under attack by modern day puritans][opalgate]. Use this badge to declare that your project is POOP: Peacefully Opposing Oppressive Puritanism.