Git vs. Mercurial

GIT is good to be used for faster and high availability operations during code release cycle. Git provides a complete replica of the repository on the developer's local system which is why every developer will have complete repository available for quick access on his system and they can merge the specific branches that they have worked on back to the centralized repository. The limitations with GIT are seen when checking in large files.

Incentivized

If you generally think that to develop software you have to choose one repository, then in my opinion you have to choose between Mercurial and Git, there is not other solution. Mercurial also has a good merge tool which i can recommend. This gives you the flexibility to push just the "part of the feature", and is much better suited in the case where the "part of feature" and some other "part of the feature" both contain changes to the same file.

Incentivized

• Ability to create branches off current releases to modify code that can be tested in a separate environment.
• Each developer had their own local copy of branches so it minimizes mistakes being made.
• Has a user-friendly UI called Git Gui that users can use if they do not like using the command line.
• Conflicts are displayed nicely so that developers can resolve with ease.

Incentivized

• Branch
• Distributed architecture
• Stable
• Platform independent

Incentivized

• There can be quite a number of commands once you get to the advanced features and functionality of Git. Takes time to master.
• Doesn't handle static assets (ie: videos, images, etc.) well. Although in the recent years, new functionality has been introduced to address this.
• Many different GUIs, many people (including myself) opt to just use the command-line.

Incentivized

• Integration with visual studio
• More integrated tools
• When I install Mercurial I always have to do a hard restart of my computer.

Incentivized

Git has met all standards for a source control tool and even exceeded those standards. Git is so integrated with our work that I can't imagine a day without it.

Incentivized

Git is easy to use most of the time. You mostly use a few commands like commiting, fetch/pull, and push which will get you by for most of time.

Incentivized

I am not sure what the official Git support channels are like as I have never needed to use any official support. Because Git is so popular among all developers now, it is pretty easy to find the answer to almost any Git question with a quick Google search. I've never had trouble finding what I'm looking for.

Incentivized

It's easy to set up and get going.

Incentivized

I've used both Apache Subversion & Git over the years and have maintained my allegiance to Git. Git is not objectively better than Subversion. It's different.
The key difference is that it is decentralized. With Subversion, you have a problem here: The SVN Repository may be in a location you can't reach (behind a VPN, intranet - etc), you cannot commit. If you want to make a copy of your code, you have to literally copy/paste it. With Git, you do not have this problem. Your local copy is a repository, and you can commit to it and get all benefits of source control. When you regain connectivity to the main repository, you can commit against it. Another thing for consideration is that Git tracks content rather than files. Branches are lightweight and merging is easy, and I mean really easy.
It's distributed, basically every repository is a branch. It's much easier to develop concurrently and collaboratively than with Subversion, in my opinion. It also makes offline development possible. It doesn't impose any workflow, as seen on the above linked website, there are many workflows possible with Git. A Subversion-style workflow is easily mimicked.

Incentivized

When we chose Mercurial it was more popular from perspectives than Git and we have too many problems with the Microsoft team foundation solution. We also want to move from a centralized version of source control to a distributed one. We also were working more and more via the Internet with our source control so distributed version was only solution.

Incentivized

• Git has saved our organization countless hours having to manually trace code to a breaking change or manage conflicting changes. It has no equal when it comes to scalability or manageability.
• Git has allowed our engineering team to build code reviews into its workflow by preventing a developer from approving or merging in their own code; instead, all proposed changes are reviewed by another engineer to assess the impact of the code and whether or not it should be merged in first. This greatly reduces the likelihood of breaking changes getting into production.
• Git has at times created some confusion among developers about what to do if they accidentally commit a change they decide later they want to roll back. There are multiple ways to address this problem and the best available option may not be obvious in all cases.

Incentivized

• Improve time in merging
• Branching enables us to keep separate version per customer
• Good tool for programmers is sometimes a reason to stay

Incentivized