Questions tagged [version-control-systems]

Version control systems (VCS) keep track of file or project history. Many of these systems can us the vi family of editors for tasks (such as editing commit messages), and many Vim plugins provide interaction with VCSs from within Vim itself.

Filter by
Sorted by
Tagged with
14
votes
1answer
2k views

vimdiff and merge conflicts

When merging branches under source control there is often the issue of a merge conflict with other developers. I know that we can use vimdiff to diff code changes against source control, but is there ...