0
votes
1answer
205 views

GitX: reset master to here

I'm using GitX to work with a Git repository for a project. Somehow, things got out of sync and although I can pull the latest changes, I can't commit anything because it thinks there is an unresolved ...