I am currently using "JEDI" as a version control tool.

I am currently using "JEDI" as a version control tool. One of Jedi's limitations is that it exclusively locks a file when a developer checks it out. In my opinion this is a complete productivity killer. I have been told that Jedi is the way to go because it was specifically designed to handle Delphi projects (for example it checks out the dfm and .pas files together and so forth).

I would like to switch to git instead. Can anyone provide me some feedback on this? In particular I would be interested in knowing how git can be used with large Delphi code bases. How difficult would it be to branch and merge?