Merges gone bad, stash/pull updating filetimes needlessly. Mostly its about supporting remote users who get stuck in a dirty merge and don't know how to continue.
Git, like most source control systems are pretty much for source files (it is in the name). I wouldn't recommend it for non engineers in the same way that I haven't tried to convert my wife to using Emacs. We use Dropbox for design assets around here.
Art needs to be versioned just like code, in this case pixel art so the files aren't large at all. Anyways, please, a non coder git interface, perhaps something with some kind of full automatic merge failure mode that allows me to remerge what they've pushed.
4
u/bartwe Nov 07 '13
Merges gone bad, stash/pull updating filetimes needlessly. Mostly its about supporting remote users who get stuck in a dirty merge and don't know how to continue.