Questions tagged [version-control]

Version-control software allows you to keep several versions of a file. Each time the file is changed, a new version is created. Older versions can be retrieved. Related files can be grouped together. Multiple people can edit the same files and their changes can be merged together.

278 questions
112
votes
1 answer

GIT merge master into a branch

I have been developing a new feature on a new branch, and on the side have committed quite a few changes on my master branch. Is it possible to merge the master branch into my new branch to keep it up-to-date so that I won't have too many merge…
mnml
  • 2,051
63
votes
5 answers

Setting up an encrypted git-repository

Situation Hi, I would like to save data with git, encrypted (on some platform like bitbucket or github). Therefore the question: Question I am looking for different hassle-free ways on: How to set up an encrypted repository on…
43
votes
7 answers

Want to delete revisions from my SVN repository

The latest revisions in my code repo has been corrupted and has destabilized my app. I want to revert to an earlier revision. But I don't want to simply use 'revert' on my working copy; I actually want to delete my head revision and several…
Chris Barnhill
38
votes
3 answers

Version control for binary files?

Is there a good version control system for binary files? I would like to be able to use VC with things like photos and Word documents. I know some existing systems such as Subversion and Git support binary files, but I've read that they have lots of…
22
votes
11 answers

Version control for images

When working with images, I tend to start saving things as image_001.png and image_002.png for different versions of the same image. Being a programmer, I know that that isn't really a good way to do version control. I realize that there are some…
19
votes
6 answers

Subversion: How to compare differences between incoming changes?

I would like to see the changes that my co-workers have made before I accept the incoming changes. So I start by getting the status svn st -u ...which tells me that I've got an incoming change * 9803 incomingChanges.html M 9803 …
Andrew
  • 15,494
19
votes
27 answers

Time Machine vs Source Control?

Finally got convinced to start using some kind of version control for my code instead of zipping down a copy of the project at the end of each day. Downloaded Tortoise SVN and used it to create a repository localy on my hdd. I've been using it for 2…
Blub
18
votes
10 answers

Automatic versioning upon file change (modify/create/delete)

I am looking for an implementation (on Linux) of a mechanism which would automatically and transparently version any changes in a directory (recursively). This is intended to be an addition (possibly replacement if all the requested features are…
WoJ
  • 3,875
17
votes
3 answers

How do I remove outgoing changesets in Mercurial (hg)

when I run hg out I have 3 outgoing changesets. I want to trash them and revert to how things are in the central repository. How?
adambox
  • 955
17
votes
3 answers

How do I prevent a "No supported authentication methods available" error when using TortoiseHg?

I'm trying out Mercurial for the first time but am having problems doing a push/pull/clone with a remote server (in this case it's codebasehq.com) when using TortoiseHg. Here are some steps to reproduce: Download and install TortoiseHg Go…
jammus
  • 1,294
17
votes
5 answers

Does Microsoft Office 2010 have version control?

Does Microsoft Office 2010 have version control? In other words, does it automatically save old versions of files?
16
votes
1 answer

How can I selectively disable zsh's version control integration when my CWD is on a remote filesystem?

I'm running zsh on OSX and on occasion I have to work on a mounted sshfs volume. However, git is REALLY slow over sshfs mounts. My prompt makes use of the vc mode stuff that zsh provides built in, but in this case I want to skip that part. I'd like…
Chris R
  • 1,921
16
votes
4 answers

Which Version of Microsoft Word created a given document?

I'm starting to get multiple MS Word documents sent to me, and I'd like to detect what version of MS word created, or last saved, each doc. Is there some tool for that?   Or, can I determine such information by looking with a text editor or a…
Brock Adams
  • 2,200
14
votes
3 answers

Despite the fact that GIT does NOT store file deltas, can you still rollback to previous file versions (unlimited times?)

I've read that Git does not store file deltas. If this is true, how does it support file rollback to previous versions? If it's storing the entire file the repository space on disk must grow to be unmanageably large. Does Git support file…
12
votes
0 answers

Why is hg fetch a deprecated extension?

Mercurial's fetch extenson conveniently pulls and merges from a remote repository. Recently, this feature has been deprecated by the developers. They recommend avoiding it and it is on the unloved features list. It is useful in many cases to be able…
Jan
  • 243
1
2 3
18 19