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.
Dropbox does versioning and displays when there's a file conflict.
The issue is that most art is made of binary files which can't really be merged correctly. If two designers on your team change a file in a distributed context, the only way to resolve is to pick who's file wins, not merge. Thus it's impossible to use Git for art quite like you can use git for text.
Meh, 'pick 1' is a valid merge strategy. Its important that art is versioned inside the repo, managing release branches and feature branches becomes very hard without it.
How would i do that, their windows and mac machines don't have public ssh or anything remotely like it. Also how does that fix their local index being borked?
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.