Skip to content

Instantly share code, notes, and snippets.

Avatar
🏠
Working from home

Sam A. Horvath-Hunt samhh

🏠
Working from home
View GitHub Profile
@mattratleph
mattratleph / vimdiff.md
Last active Nov 23, 2021 — forked from roothybrid7/vimdiff_cheet.md
vimdiff cheat sheet
View vimdiff.md

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
@chrisdone
chrisdone / typing.md
Last active Aug 24, 2021
Typing Haskell in Haskell
View typing.md

Typing Haskell in Haskell

MARK P. JONES

Pacific Software Research Center

Department of Computer Science and Engineering

Oregon Graduate Institute of Science and Technology