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
3 answers

What is your version control and deployment workflow with Rails?

Especially when considering a fresh Rails project, what does your version control and deployment workflow look like? What tools do you use? I'm interested in answers for Mac, *nix and Windows work machines. Assume a *nix server. I'll edit for…
Ben Hamill
  • 2,661
  • 2
  • 19
  • 18
13
votes
4 answers

Can't Push After git reset --soft HEAD^

Just now I committed and pushed something (yes, my mistake on the push) that I decided I should 'revert' or 'undo'. So I was told to issue git reset --soft HEAD^ on my end, and I figured this would somehow create a 'revert' commit that once…
Jorge Israel Peña
  • 36,800
  • 16
  • 93
  • 123
13
votes
1 answer

Converting big bzr repository to git, what to expect?

I'm trying to convert some old Bazaar repositories to git, and while everything seem to go through smoothly, I'm a bit unsure if it really went as well as it claimed. My Bazaar repository is structured like…
Soraz
  • 6,610
  • 4
  • 31
  • 48
13
votes
1 answer

In bazaar, how do I change the default target of "bzr push"?

bzr push defaults to the first target you pushed to. If I now want to push to a different location, but don't want to manually enter it every time, how do I change the default?
Matthew
  • 28,056
  • 26
  • 104
  • 170
13
votes
5 answers

Git Workflow Best practices

Stupid question and treat me as completely a newbie to version control. I'm new to Git (I've used subversion before, but just the basics) I understand the basics of Git and its branching commands, I have an imaginary situation that need your…
Liming
  • 1,641
  • 3
  • 28
  • 38
13
votes
5 answers

Using git to find first introduction of token on a specific line of a file

Let's say I have a file A.cpp, and I notice an error on line 15 of the file. Let's say the error is a "const" on a function that returns a pointer to a member variable, meaning using const on the function is technically correct but semantically…
oz10
  • 153,307
  • 27
  • 93
  • 128
13
votes
1 answer

Subversion oddity - svn info revision higher than last changed rev on project folder

Got something going on I can't explain. I have a working copy of my project - done svn update (which says: Updated to revision 1895), I know it's the latest. When I perform an svn info on the project folder, the Revision is 1895, but the Last…
Wim
  • 11,998
  • 1
  • 34
  • 57
13
votes
1 answer

how to collaborate with other authors using org-mode?

I'm using org-mode. How do I collaborate with other people who are not using Emacs? It seems like the standard for document collaboration is Google Drive/Google Docs. This is fine, but my preferred environment is Emacs org-mode. Short of cutting…
incandescentman
  • 6,168
  • 3
  • 46
  • 86
13
votes
1 answer

Do we need to check in *.xcuserstate?

I am wondering do we need to checkin *.xcuserstate file? I think it is not part of source code? But maybe it is important to maintain it in the source control?
Adam Lee
  • 24,710
  • 51
  • 156
  • 236
13
votes
6 answers

Using Subversion, where is "actual" source code stored?

I'm just getting used to Subversion and I have a fundamental question about versioning. I've created my SVN repository on a server "S" hosted in my network. Assuming I "import" code, files, directories, etc. from another computer "A" in the network,…
KG -
  • 7,130
  • 12
  • 56
  • 72
13
votes
9 answers

Database source control with Oracle

I have been looking during hours for a way to check in a database into source control. My first idea was a program for calculating database diffs and ask all the developers to imlement their changes as new diff scripts. Now, I find that if I can…
borjab
  • 11,149
  • 6
  • 71
  • 98
13
votes
3 answers

How can I tell Emacs my git branch has changed?

At the bottom of my Emacs 23 editor, I notice that Emacs is aware that I am working in a directory that is under version control, what that version control system is, and what branch I am currently on. Pretty cool! But say I am on the master branch,…
Houdini
  • 3,442
  • 9
  • 31
  • 47
13
votes
2 answers

How do I prevent SVN from caching credentials for a single repository?

I'm using Collabnet SVN client versions 1.5 & 1.6. My local machine is running Windows Vista x64 (I know, very sad indeed). I would like to force authentication every time I try to perform any subversion operations on a selected repository. How…
mkelley33
  • 5,323
  • 10
  • 47
  • 71
13
votes
6 answers

Where can I find the patience diff implemented?

It is well-answered on this site that Bram Cohen's patience diff is found in bazaar as the default diff and as an option with git diff, but I am finding it difficult to source an independent standalone program that implements this particular diff…
Steven Lu
  • 41,389
  • 58
  • 210
  • 364
13
votes
8 answers

Single Codebase multiple websites

We have developed a system that uses a single code base, consisting of four Visual Studio projects with an admin website, and customer facing website (each system has its own MS SQL database). This has been working great, as all new websites…
JamesStuddart
  • 2,581
  • 3
  • 27
  • 45