If it's not something major, you can try using git reset to revert to a suitable commit before the conflicts, and then use git pull to fetch all the changes. This should resolve all your conflicts.