Change wording for ignore and discard
Better git error handling

Shows a dialog instead of crashing all of the app when a git error occurs