I'd like to bring the marvels of source control management to a group of non-developers who are using Dropbox to share scripts, but Git can be confusing even if I give them the basics. Is there any kind of tool that can help non-developers follow a single workflow, and not panic as they get a merge-commit? I'm thinking nothing more complex than a pull-merge-push, no branches.
I do feel SourceTree is a tad overkill here.