Questions tagged [version-control]

Version control is the management of changes to documents, programs, and other information stored as computer files. Use this tag to mark general questions about usage and applicability of version control, VCS comparison. For most commands and techniques specific to each particular VCS there are specific tags, which should be preferred.

Version control, also known as revision control, source control or software configuration management (SCM), is the management of changes to documents, programs, and other information stored as computer files. It is most commonly used in software development, where a team of people may change the same files.

For questions specific to a certain version control software use the appropriate tag. Here is an (incomplete) list of commonly used tags:

17112 questions
13
votes
2 answers

Can I add changes to staging area from another branch?

I have two branch, master new-features New features have a commit I want to add to master but I want the control how much I want to merge. I would like the option to add/reject changes for each line. Similar I can do with git add -p I have…
Sisir
  • 2,668
  • 6
  • 47
  • 82
13
votes
4 answers

Best practice for SVN tags?

Should I use them as separate releases? Do I check them back into trunk or branches? Is this all in the red book and I've just wasted your time?
nickmjones
  • 482
  • 1
  • 5
  • 16
13
votes
4 answers

How do clone a Mercurial repository into a directory that already exists?

I have a client's Django project that I'm developing locally, using Mercurial for version control. I push my local repository to my personal remote server (where I keep all my projects) and then when I come to deploy it (on whichever web server) I…
littlejim84
  • 9,071
  • 15
  • 54
  • 77
13
votes
2 answers

Do Microsoft employees use Visual Source Safe (VSS)?

Microsoft has always been adamant about their use of "dogfooding" in the software development process, and it's made tools like Excel and Visual Studio work pretty well. My question is this: Do Microsoft employees use VSS? Have they ever used it? If…
Joey
  • 2,901
  • 21
  • 22
13
votes
3 answers

git rebase already merged branch?

I created a feature branch from master branch. After that there is a commit [F1] from feature branch. [F1] -- Feature Branch / [M1]-[M2] -- Master Branch After that, feature branch is merged in master…
manish
  • 966
  • 2
  • 11
  • 35
13
votes
1 answer

SVN-Git migration: clean-git branch error

I'm following the SVN to Git migration guide, the git svn clone goes fine but when I run the cleanup command I get this error, I'm not even sure what this means. How do I solve this ? java -Dfile.encoding=utf-8 -jar ~/svn-migration-scripts.jar…
blackbird
  • 1,129
  • 1
  • 23
  • 48
13
votes
2 answers

In Eclipse, how to have launch configurations relative to the project?

I usually have multiple copies of a project, for example: a copy of the trunk and another of the last release branch. To cleanly separate my project files from Eclipse, they are checked out from Subversion in a directory outside the Eclipse…
neves
  • 33,186
  • 27
  • 159
  • 192
13
votes
6 answers

Is there an easy way to revert an entire P4 changelist?

Let's say I checked in a changelist (in Perforce) with lots of files and I'd like to revert the entire changelist. Is there an easy way to "revert" the entire changelist in one fell swoop? Currently I do something like this for each file in the…
Marc Novakowski
  • 44,628
  • 11
  • 58
  • 63
13
votes
2 answers

What is the alternative to using --process-dependency-links with pip

I am using Python 2.7. I am trying to pip install a repo (on internal github) that has a dependency on another repo (also on internal github). I tried several options but the one that worked was like this: (env)abc$ cat requirements.txt -e…
Ankur Agarwal
  • 23,692
  • 41
  • 137
  • 208
13
votes
5 answers

Committing broken code to the repository for the purpose of backing it up

I was just talking to another developer (more senior than I) and trying to convince him that we should implement continuous integration via Cruise Control. He told me that this will not work because he commits code that does not compile to the…
Tim Merrifield
  • 6,088
  • 5
  • 31
  • 33
13
votes
4 answers

Visual Studio SVN integration

Is there any way to properly integrate Subversion control into VS2008? I'm currently using the TortoiseSVN shell extensions, but I keep forgetting to check in new files and it's easy to get in a confused mess. On another project I use VS2008 with…
Piku
  • 3,526
  • 6
  • 35
  • 38
13
votes
3 answers

How to automatically align/sync a forked Github origin/master branch to upstream/master?

Is there a way to automatically sync my forked Github repository's remote master branch (origin/master) to an original Github repository's master branch? (upstream/master) I ask because I would like my forked remote origin/master branch on Github…
Kelsey Hannan
  • 2,857
  • 2
  • 30
  • 46
13
votes
1 answer

Git: When does Git perform garbage collection?

I was wondering: when does Git perform its garbage collection? I know that in the past one had to invoke git gc to manually start the garbage collection, but now it is done automatically, when? Also, is there a need to invoke it manually in the…
Wazery
  • 15,394
  • 19
  • 63
  • 95
13
votes
3 answers

Visual Studio Website Reference Paths

In Visual Studio website projects (in Visual Studio 2005 or later, not web application projects where there is still a .csproj file) how is the reference information stored, and is it possible to source control it without storing compiled binaries…
David Boike
  • 18,545
  • 7
  • 59
  • 94
13
votes
5 answers

version control on large files

We happily use SVN for SCM at work. Currently I've got our binary assets in the same SVN repository as our code. SVN supports very large files (it transmits them 'streamily' to keep memory usage sane), but it is SLOOWWWWW. What asset management…
Dustin Getz
  • 21,282
  • 15
  • 82
  • 131