Is there a way to know if someone else, then, is trying to access the same files you’re working on? Or are you automatically locked out when that file is in use? Is it possible that, if there are more than one files being utilized that the ‘merge’ you are attempting gets stalled? Are you, yourself determining how many files may be moved about or merged in the actual program you’re using?
As I said, I am not familiar with the program you’re using and it’s been many years since I did any of this. In the beginning of my time even DOS was an unknown at least in the first computers I delved into messing with housed programming but I became noted for troubleshooting what was housed and then going inside and changing programming language. Eventually I was in DOS moves which is now relatively elementary to what is used today (or what you are using), and developed macro programs for principals.
Sometimes the best way to understand any program (if that’s to be your field) is to dismantle it.
If all you’re doing is designing web pages that will indeed use this program, then you really ARE going to have to troubleshoot what this particular program is capable of doing and how far you can stretch it. THAT’s vital because the pages you develop will be used (probably) by novices who will tax them to the limit. Whatever frustrations YOU are having now they will complain about later so tax the program as far as you can…....................THEN whittle everything down so that even an idiot can use it effectively. You really don’t have a choice if this is the program that will be ongoing…...so attack it.
..................................edit: have you read what companies had to say about your program: http://stackoverflow.com/questions/6011893/tortoisegit-vs-git-extensions