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.
280
questions
112
votes
1
answer
298k
views
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 ...
- 2,031
59
votes
5
answers
33k
views
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 ...
- 731
43
votes
7
answers
107k
views
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 ...
Chris Barnhill
38
votes
3
answers
31k
views
Version control for binary files? [closed]
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 ...
- 6,959
19
votes
27
answers
3k
views
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 ...
19
votes
11
answers
7k
views
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 ...
- 525
19
votes
6
answers
21k
views
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
...
- 14.9k
18
votes
10
answers
18k
views
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 ...
- 3,133
17
votes
5
answers
49k
views
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?
- 4,404
17
votes
3
answers
30k
views
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 ...
- 1,304
16
votes
3
answers
15k
views
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?
- 945
16
votes
4
answers
12k
views
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 ...
- 2,140
16
votes
1
answer
4k
views
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 ...
- 1,911
14
votes
3
answers
12k
views
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 ...
- 359
12
votes
1
answer
6k
views
Version Control for Microsoft Word
Is there a good version control method for strongly formatted word docs? Ideally something that works with git and shows the diff in an easy-to-view format.
Most of the questions I've seen on this ...
- 223
12
votes
0
answers
1k
views
Why is hg fetch a deprecated extension? [closed]
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 ...
- 243
11
votes
4
answers
13k
views
Subversion: Document Control for Non-Programmers?
I work for a small company in the Mechanical Engineering sector. Nobody here knows a thing about coding or databasing except for myself, and I know little more than basic SQL, some C#, some VBA.
I'm ...
- 3,147
11
votes
2
answers
3k
views
How to track $HOME with git
I would like to track my $HOME dir with git. I've got many other git repos in other subdirs (eg $HOME/projects/repo_1 and so on), which shouldn't be tracked, since they already are.
I have found git-...
- 684
9
votes
6
answers
2k
views
Which Revision Control Software to use for Personal Dropbox? [closed]
I want to set up a sync repositiory that would be similar to Dropbox.
Goals/Requirements:
Free (Open Source very preferable)
Linux host (probably Ubuntu)
Windows/Mac/Linux clients
Potential for ...
9
votes
3
answers
3k
views
View incremental diffs of my revisions to files using Dropbox
Sometimes I use a simple editor like Notepad++ to edit my webpages on Dropbox.
Notepad++, not being an über-editor or IDE, does not track file changes for me.
But Dropbox does!!
Has anybody ...
- 3,678
9
votes
1
answer
2k
views
Git equivalent to hg update
I've used Mercurial for some time now, and am used to its workflow. Suddenly, I need to work with a Git repository, and I cannot make the install work from the head revision. In Mercurial I would ...
- 716
9
votes
5
answers
17k
views
How do you compare multiple folders with same files to find all different versions of the same file?
I've got 700+ folders with the same set of 200+ classic asp files (basically text files) in each folder. Over the years various people have made minor changes inside these asp files. I need an utility ...
- 193
8
votes
8
answers
2k
views
user friendly revision control system
I'm looking for a user friendly revision control system that both me and my non technical wife can work with. I've tried subversion and perforce but found them to be over complicated and some things ...
- 81
8
votes
7
answers
2k
views
Version control for Windows configuration
How can I put my Windows personal configuration under version control?
Summary (details and examples follow):
Personal configuration (e.g. desktop preferences), not system configuration (e.g. ...
8
votes
7
answers
2k
views
concurrent word document collaboration
My colleagues and I are working on a large specification, in Microsoft Word
For the first few weeks, we all worked on separate pieces, and collated these together to form a single specification.
Now,...
- 239
8
votes
5
answers
965
views
Version Control for MP3s?
I've got a lot of "binary media", which I'll abstract away as "MP3s". I've also got several computers that I'd like to have the whole library on - a desktop, media box, a laptop here or there, etc. ...
- 2,571
8
votes
1
answer
3k
views
Encrypt files before sending them to Cloud
Recently I switched to GIT along and picked bitbucket to host my code.
Now with all the snowden scandal, I decided to review my choices.
I really don't want to host my data on my own server, I'd ...
- 219
8
votes
2
answers
21k
views
Rebasing a branch which is public
I'm failing to understand how to use git-rebase, and I consider the following example.
Let's start a repository in ~/tmp/repo:
$ git init
Then add a file foo
$ echo "hello world" > foo
which ...
- 1,908
8
votes
1
answer
33k
views
I forgot to activate Track Changes in a Word document. How to highlight my edits?
After I saved the document and closed Word, I realised that I forgot to activate Track Changes. I have a copy of the previous revision.
How can I highlight my (too many) edits before sending the ...
- 203
8
votes
2
answers
6k
views
Is it safe to delete a branch from a github fork once it's been merged upstream?
I've only recently tried my hand at forking in github and would like some "best practice" advice.
I created a branch in my fork, and that branch got pulled into master of the upstream project. It no ...
- 412
8
votes
3
answers
9k
views
checking out a portion of a git repository
How can I check out just a portion of a Git repository? I have a repository that has several modules, and I only want one of the modules installed on a particular site.
In Subversion, I'd do svn ...
- 2,262
8
votes
2
answers
3k
views
How to prevent Excel from modifying the file on exit?
Whenever I open an Excel file and then close it without changing anything, the Excel would modify the file without asking a permission or giving any kind of warning. It modifies just 4 bytes at offset ...
- 191
8
votes
1
answer
3k
views
.gitignoring pdf file only when a tex source is present
I'd like to set up a global .gitignore file in my home suitable for working with TeX files. So typical TeX junk files such as *.log, *.aux, *.synctex.gz would go in it.
The next step, however, is ...
- 365
8
votes
3
answers
1k
views
version control of for PDFs with annotations
I have a a lot of important PDF files. The only way I modify them is add/remove annotations. Is there an efficient way to have version control for such files. I can perhaps use standard tools like SVN/...
- 276
7
votes
2
answers
13k
views
Git (Windows): Newbie: Can't commit new repository ... "did not match any files(s) known to git"
I just installed Git on Windows XP Pro and I'm trying to apply it to my project.
I'm trying git-ize a legacy directory structure:
C:\src>git init
C:\src>git add *.c
C:\src>git commit -m '...
- 359
7
votes
4
answers
7k
views
SVN Getting all revisions of a file
I have a moderate size repository (around 2500 versions) from a project I've been running in the past 3 years. There is a particular file (let's call it foo.xml) there which I now want to analyse its ...
7
votes
3
answers
9k
views
git-receive-pack : command not found
I made a git repo on a local machine with "git init --bare" and added it as the remote origin on the project on my main computer with ssh:
git add remote origin [email protected]:repoName.git
I was ...
- 765
7
votes
1
answer
2k
views
Sublime Text, getting configuration under version control
After using vim for the better part of a year I've decided to give Sublime Text 2 a whirl.
Using vim my .vimrc of course grew quite substantial since I constantly found small ways to modify it, I ...
7
votes
6
answers
2k
views
bitbucket on my own server
I want to have something like bitbucket.org or github (but for mercurial!) on my VDS. I don't need full functionality, but I need it being able to serve repositories, accept changes (with auth!) and ...
- 908
6
votes
11
answers
400
views
Are there any applications for distributed revision control (DVCS) if I'm not a programmer? [closed]
The terms DVCS and Git seem to be thrown around a lot. Are there any applications for this technology if I'm not a programmer, but just a regular "superuser"?
- 2,606
6
votes
2
answers
9k
views
Git doesn't observe new exceptions in .gitignore
[NOTE: This is not the usual "Git still tracks files I just added to .gitignore!" problem. This is the opposite of that.]
I have a website's full directory structure in a Git repository. The CMS I ...
- 192
6
votes
1
answer
11k
views
How do I check the version of a Windows Store Application? [duplicate]
Possible Duplicate:
How do I find the version of a Windows 8 store/RT app I have installed?
As any Windows software, Windows Store apps have a release version, but I couldn't find it by looking ...
- 30.5k
6
votes
1
answer
3k
views
Should I add keystore files to version control?
Is there any reason to not store keystore files in version control? Is there a security risk to doing so?
- 179
6
votes
1
answer
128
views
How can I allow individual developers to have their own space to create git repositories?
I have a server that is essentially a gitosis setup. I have a git user that has access to all the shared repositories. What I would like to do is have each developer be able to have their own "area" ...
- 8,612
5
votes
3
answers
6k
views
Setting up a remote Mercurial repository
I have a mercurial repo set up on a server and I'd like to be able to access it remotely. How would I go by doing that?
- 1,815
5
votes
2
answers
7k
views
Add a parent directory to a git repositoy
I have created a git repository for the C implementation of a program.
I am about to add a Matlab implementation and I would like to have a single repository with two subdirectories: one for the C ...
user36354
5
votes
1
answer
4k
views
Configure Git to use Beyond Compare for image diff
Because we work with a number of sprites, the kind of specialised diff views provided by Beyond Compare would be ideal to see which one of 2 versions I'm after when conflicts arise.
I've already ...
- 330
5
votes
2
answers
2k
views
How to keep my OSX settings under version-control?
Coming from Linux, I've gotten in the habit of keeping my config files under a git repository.
Since I got a macbook however, I've made a lot of tweaks through defaults write and preferences panels, ...
- 1,546
5
votes
2
answers
643
views
Which version control should I use for my configuration files?
I want to store some of my configuration files (~/.emacs.d/, .Xdefaults, etc. linux $HOME stuff) in version control so I can easily sync them with my notebook/workplace and see my past changes and ...
- 383
5
votes
1
answer
1k
views
ST3: Annoying file changed reload popups
I use sublime text for my editors. I love it for everything else but 1 thing which is so annoying according to me. Whenever I change my branch, it brings up a pop up saying that file has changed and ...
- 101