> All of these issues can be avoided

... if you use a gui in front of git :)