$ git diff
diff --cc band.txt
index 881378c,10b72a3..0000000
--- a/band.txt
+++ b/band.txt
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< ian
 +MERGE
++=======
+ CONFLICT
++>>>>>>> ash
$ cat README
merge conflict is a live coding duo
that recognizes the impossibility of collaboration
and the inherent tensions between people, places, and things.
$ cat NEWS
* 2024-09-14
merge conflict presents "Swan Songs" @ the futures lab w/ data dancers, underground atlanta, 8pm
* 2024-04-21
merge conflict spring cleaning special @ GTCMT
* 2023-12-13
merge conflict christmas special @ GTCMT
* 2023-09-14
merge conflict w/ data dancers @ the futures lab, underground atlanta, 8pm
$ ls misc
doom.mkv  hams.mp4  tutorial.html
$ exit