The display of merge conflicts are confusing to new / non-technical users. I propose a better warning system when your working copy has merge conflicts, for the sake of saving engineer's lives (If you have a soul, please help): Crazy red warning that changes background color of working copy display. Maybe additional markers in the UI to represent, "Hey, something's wrong."

Current issue: Merge conflicts only show up as an easily-dismissed dialogue with lots of text, and little markers next to items. Too many times to count, we've had artists/designers pull down the project, have a conflict, have the merge show up as expected (all local and remote modifications, plus conflicts marked with exclamations), and the user simply discards all of the files they didn't change (including all remote modifications in the merge), causing lost work and/or lots of engineer time to bring back the lost content.

By just adding a red background and a warning banner in this situation, it would make it incredibly easier to handle these situations on large teams, especially as we're bringing on lots of new users that have little or no git experience. Training helps, but these indicators will do wonders.