From 41cdcd9a898d47d224316c335dfaf05369543000 Mon Sep 17 00:00:00 2001
From: Hamid Eftekhari <hamidef@umich.edu>
Date: Thu, 23 Aug 2018 11:43:29 -0400
Subject: [PATCH] Edit in my fork of JustOneThing.md

---
 JustOneThing.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/JustOneThing.md b/JustOneThing.md
index 26659fd..5831d2a 100644
--- a/JustOneThing.md
+++ b/JustOneThing.md
@@ -22,3 +22,4 @@
 **Nick**: Why couldn't we get free lunch everyday? :(  
 **Nick**: Test2  
 
+**Hamid**: How does Git merge files? When are changes incompatible?