latest 3 messages by WarriorX
+
[2016-08-18T01:30:16Z]
WarriorX
what does that mean?
+
[2016-08-18T01:30:09Z]
WarriorX
when you merge, if you have file_a on both branches (main and x_branch) the content get merged as well!
+
[2016-08-18T01:29:38Z]
WarriorX
does git work on a file level?