ours vs theirs

2022-05-14 11:33:15 +01:00 · 2022-05-14 11:33:15 +01:00 · e206c93737
parent 01a6b2c982
commit e206c93737
1 changed files with 1 additions and 0 deletions
--- a/content/reference.gmi
+++ b/content/reference.gmi
@ -17,6 +17,7 @@ for my own reference really but do enjoy :)

 => https://write.jokke.space/linux-dreams-and-nightmares/mpd-with-a-remote-music-library    MPD with a remote music library [www]
 => https://vim.fandom.com/wiki/Entering_special_characters                                  Entering special characters in Vim [www]
+=> https://nitaym.github.io/ourstheirs/                                                     'Ours' vs. 'theirs' when resolving conflicts in Git [www]

 ## interesting