Database Version Control tools
We already mentioned numerous times that Rider is built on top of ReSharper, analyzing our code in the background, and the IntelliJ platform, providing the front end and editor capabilities for our cross-platform IDE for .NET.
Doing so lets us ship the best of both worlds: both products have been evolving over years, and Rider profits. So when IntelliJ IDEA 2016.3 was released, we merged all of the improvements to language-independent features such as version control and the database editor into Rider. Let’s go over some of these improvements!
Being built on top of the IntelliJ platform, Rider shares a lot of functionality with our other IDE’s like WebStorm or PyCharm. A good example are all of the version control system (VCS) features, which the PyCharm team made some great videos about last summer. Do check them out, they are very relevant for Rider as well!
We promised to cover improvements to the VCS functionality in Rider, so let’s do that now.
The commit log tool window for Git and Mercurial repositories has been redesigned. Commit details moved to the right, commit messages are now aligned and search speed has improved dramatically when searching for text, author or path.
When merging or rebasing branches and commits, Rider can help us resolve simple conflicts. When opening the built-in three-way diff for a given file, the IDE will show a Resolve icon when it can perform the merge for us. Simply clicking it will let Rider handle the conflict for us. Not satisfied? Undo (Ctrl+Z) will do the trick.
Speaking of undo: as long as it has not been pushed to origin, we can now undo a commit from the VCS log. The commit that is being undone can be copied to either the default changelist or any other existing (or new) changelist. Read up on changelists here, they are ideal for local task switching without having to branch or stash.
From the VCS | Git | Remotes… menu, we can now also manage remotes for our local repository. When working with multiple forks of a repository this can be very useful to configure (or remove) them.