Top "Version-control" questions

Version control is the management of changes to documents, programs, and other information stored as computer files.

Merge a Branch into Trunk

I'm facing a peculiar problem with SVN merge. I want to merge from a dev branch to trunk. We have …

svn version-control merge
What does "Git push non-fast-forward updates were rejected" mean?

I'm using Git to manage my two computers and my development. I'm trying to commit changes to GitHub and I'm …

git version-control
Git workflow and rebase vs merge questions

I've been using Git now for a couple of months on a project with one other developer. I have several …

git version-control git-merge git-rebase
What is the Git equivalent for revision number?

We use SVN at work, but for my personal projects I decided to use Git. So I installed Git yesterday, …

git version-control revision-history version-numbering
Should I add the Visual Studio .suo and .user files to source control?

Visual Studio solutions contain two types of hidden user files. One is the solution .suo file which is a binary …

visual-studio version-control
What's the best three-way merge tool?

Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the "base" revision) and support graphical tools to …

version-control merge dvcs
Managing large binary files with Git

I am looking for opinions of how to handle large binary files on which my source code (web application) is …

git version-control large-files binaryfiles
How can I completely remove TFS Bindings

I have a solution that contains a good deal of projects, I would like to remove the source control bindings …

tfs version-control source-control-bindings
Sourcetree - undo unpushed commits

I am using Sourcetree for Windows for a git-repository and would like to undo an unpushed commit. Is that possible? …

version-control atlassian-sourcetree
How to output git log with the first line only?

I am trying to customize the format for git log. I want all commits to be shown in one line. …

git version-control formatting logging commit-message