Yeah, me too. I'm usually only working on a couple of files at a time but then there a conflict. I try to resolve and just keep digging the hole deeper until I

Yeah, me too. I'm usually only working on a couple of files at a time but then there a conflict. I try to resolve and just keep digging the hole deeper until I just save off my files, do a new checkout and patch them in manually post what ever merge was giving me hell so there won't be any conflicts.