Built-in visual tools for VCS
A built-in visual merge tool resolves all conflicts in a quick and intuitive manner. The changes made locally are highlighted as you type in the editor gutter, providing intuitive navigation and rollback for individual changes.
A commit dialog allows you to perform code analysis, check for TODOs left in your code and reformat the code.
Also if you notice a small issue while looking at a diff, no need to go back to the editor - just unlock the editing mode and apply changes in-place.
Local History helps you get more out of your VCS or, if you don't use one, it can help you keep track of everything that goes on with your code.
With all the constant changes made to code, version control systems can only track differences between committed versions, while local changes can slip unnoticed. That's when Local History can save the day and prevent the disaster of losing your changes.
AppCode provides a first-class unified interface for most popular VCS including Subversion, Git, GitHub, Mercurial, CVS, Perforce, and TFS.
Incoming changes view
Stay up to date with your team without leaving the IDE. See what has been committed to the VCS by other team members, and refer to the Incoming Changes view for code changes not yet integrated into your local copy.
While working on several things at a time, grouping your changes into multiple change lists can come in handy. Use AppCode’s integrated changelists to organize your changes the way you prefer.
You can also use Shelve changes option to set aside some changes to restore in the future.