+ [2014-10-22T23:45:44Z] luto bwaahahahah I am changing THE WORLD!
+ [2014-10-22T23:46:16Z] luto VxJasonxV: look! look! The WORLD is CHANGING!
+ [2014-10-22T23:52:11Z] luto I mean that the work on yasp will continue in december

message no. 55005

Posted by MrSavage in #github at 2014-10-22T01:19:34Z

offby1: funny you say that because I did read it multiple times today but I still don't understand what they mean in the help
+ [2014-10-23T02:15:43Z] offby1 Hey, who moved my cheese?
+ [2014-10-23T06:14:34Z] ackpacket So, i'm learning to use git. My current question is about how users don't actually check out files, but instead work on them simultaneously and allow git to merge them later. Does this mean that I can only take advantage of this collaboration on files that git will understand how to merge? For example a word document that uses some funky structure from MS.. is that impossible to merge?
+ [2014-10-23T06:20:36Z] Nevik ackpacket: it's not entirely impossible, but git will have a much harder time
+ [2014-10-23T06:20:56Z] ackpacket So git is primarily for mergine plaintext
+ [2014-10-23T06:21:02Z] Nevik (and afaik, git will by default not try to merge "binary" files in a non-trivial scenario, even though you can instruct it to try)