sublime-merge

might be a software that is useful for new git users and those who prefer GUIs over CLI and do not use IDEs (PyCharm) either.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information