ours vs theirs
This commit is contained in:
parent
01a6b2c982
commit
e206c93737
|
@ -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://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://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
|
## interesting
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue