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.
269
questions
1
vote
1answer
29 views
Backup files on external disk. Take new backups only for files that have changed like GitHub
I want to backup thousands of files on my external hard disk. They are plain text files. I update some of them on a regular basis.
Now, if I copy them form my PC to hard disk, I have two options:
...
2
votes
0answers
12 views
Can I do exponential binary search, or open-interval git bisect?
Situation
git bisect is great to locate the commit that introduced a bug. You just need to know a good commit where the bug is not present, a (newer) bad commit where it is present, and a method to ...
0
votes
0answers
23 views
We are using ClearCase version control and need to set up a symlink to seperate versions of a file
We are trying to set up symlinks to a file. While setting up the symlink is fine how can we point to specific version? We also want to point to several versions. For example in folder1 we have an ...
0
votes
1answer
40 views
Find changes (new rows, deleted rows, updated rows) between two excel files
We have an excel file with two sheets (oldSheet and newSheet) both of them containing the following columns (A: "barcode", B: "price", C: "discount").
The newSheet is an ...
0
votes
0answers
35 views
Git only store past commits remotely
I have a very large git repo and to preserve storage space, I would like past commits to not be saved locally, but still available on my remote (GitHub). Is this possible?
0
votes
1answer
33 views
Versioning files in Windows 10 Personal Laptop
Often when I am working on a Word Report or a R script etc. I find myself naming a series of files as "foo_file_4_July_3pm_" or "foo_file_4_July_5pm_" etc. just to allow me the ...
0
votes
0answers
28 views
how to merge versions of files in google drive and track changes
I make changes to my files on my laptop, mostly microsoft word files.
Later I sync them on google drive. So many a times I forget which file was updated previously and which was not. So I upload the ...
0
votes
1answer
385 views
OneDrive only shows “OneDrive user” as editor in version history (but no specific username)
I share a few Excel files through OneDrive. We only access the files via browser to open them in Excel 365. When you go to the version history of a file and check a specific previous version of a file:...
0
votes
0answers
21 views
Why do git and mercurial reports conflicts in a file when the same change is made on both sides?
For instance, if I have a file that contains the text ABC, and then I make a branch and change it to ABCD, but then go back to the original branch and also change it to ABCD, then I merge the branches ...
0
votes
2answers
220 views
cvs update when we have a conflict
I am trying to update my local file with CVS UPDATE. I see the differences in CVS diff, but when doing cvs update I get nothing changed and I see M before my file name in the output. What is that and ...
1
vote
0answers
94 views
Collaborate to create Anki decks [closed]
Not sure where to ask this question. It is not a software recommendation, more of a method recommendation.
I am gonna try to administer a collaboration among 10-20 persons to create an Anki deck to ...
1
vote
2answers
102 views
Using a Git repository with secure data
A colleague and myself want to work on a project together which uses data which we are not permitted to save on our workstations (it can be saved on the company server, and we can open it on our ...
1
vote
1answer
25 views
Doing a Pull Request to latest commit on server
Let' assume the last commits in my server are like this:
A1 -> A2 -> A3
My local repo is synced with server, and now I branch from A3:
A3
|
B1 -> B2 -> B3
Finally I have finished ...
1
vote
0answers
84 views
Mercurial hg identifies unchanged files as modified
I switched to a branch and
hg revert --all
then I wanted to import a diff file with
hg import [filename]
However, I got "abort: uncommitted changes". So I typed
hg st
It turned out that I had ...
0
votes
1answer
22 views
Team Foundation Server - Git Enabled Team Project vs Git Team Project
We have a TFS 2018 project, that looks like it was accidentally created as Version Control = TFVC when we wanted to use Git. However it is git enabled; we use Git repos for Source Control. I created ...
0
votes
1answer
466 views
Difference between .pdf and *.pdf in gitignore
Does including .pdf in a .gitignore file indicate that a file literally named .pdf will be ignored while including *.pdf ignore any file that ends in that file ending?
0
votes
0answers
119 views
Using subversion and git at the same time
In my little firm, I have been using subversion for over 5 years. I am using VisualSVN Server Manager for managing repos and tortoiseSVN in user's computer to commit, update etc.
I want to keep this ...
0
votes
1answer
88 views
Git: pushing signed commits crashes all operations
I am using different git repositories for source code versioning cloned from different upstream origins (e.g. GitHub.com, gitlab.com, self-hosted gitlab etc.), all with SSH key access. git pull always ...
0
votes
1answer
62 views
Lost github commits
Having some dissertation panic here :|
Basically, I did something silly, I had two branches off of the master branch working on two separate things: branch A and branch B. This meant 0 conflicts. I ...
0
votes
1answer
152 views
Tortoise Git Commit Lost
I wonder if you could help me. I created a new branch on GitHub using the web interface. I checked out the master repository and switched to this branch and pulled, using tortoise git.
I made all my ...
2
votes
1answer
848 views
How to use GitKraken on Heroku
I'm new to using Heroku and I noticed that the way we push our code to it is by using git commands.
I was wondering if it's possible to use GitKraken to do it.
I used GitKraken only on 2 BitBucket ...
1
vote
2answers
3k views
RVM can't find installed new Ruby version (previously installed using Homebrew)
I'm a beginner, please excuse me if I'm saying or doing things you perceive as utterly stupid. I'm not doing it on purpose.
How this started: I wanted to install gems, but got the following error ...
1
vote
1answer
32 views
ClearCase: How to write anything to Clearcase-managed directory?
I am completely new to ClearCase (I have mostly used SVN and some Git in the past).
I have spent some hours trying to write anything new into a directory managed by ClearCase. e.g. mkdir foo returns ...
1
vote
1answer
83 views
Emacs - Is it possible to have a save history of a file?
I want to know if there is a way to have file history in emacs.
With file history I mean:
List all the times a file has been saved.
View the diff between the current file and the file in that version....
-1
votes
1answer
405 views
Git: should I checkout a tagged version or master in production?
General question around Git.
We work in 2 week sprints and have a 4 branch process:
develop > Release-B-Name(Test) > Release-A-Name(Beta) > master
Each sprint, we create a new branch with some name ...
1
vote
2answers
83 views
How to store every file change indefinitely?
How can I automatically save the entire change history of the files on my computer indefinitely?
Dropbox stores file version history only intermittently and only for the past 30 days.
The solution I ...
1
vote
2answers
981 views
How to backup file from server and keep last n versions?
I am trying to create a batch script to backup an Access Db from a NAS Server to another server and keep the last "n" versions of that file (n is fixed inside the script), this script is going to to ...
1
vote
0answers
826 views
Why “svn log -g” for including merged revisions in log output takes forever?
For viewing all commits in svn log including those commits which are part of the merged branches -g option must be used. But executing svn log -g on the SVN repository which I'm working with seems to ...
2
votes
1answer
210 views
How to find source code of specific version of linux tools, i.e. ifconfig
I had a weird situation yesterday when a shell script broke on the machine of colleague. the Script was parsing output from ifconfig, and it would assume that there was no : (colon) after the ...
2
votes
0answers
67 views
Git - Limit number of revisions in advance?
I searched for the exact same term I titled this question with, but all I found were questions regarding the cleanup of git repositories which contain to many revisions of too many or especially too ...
1
vote
0answers
2k views
Migrate SVN to Git, non-standard layout
I am trying to migrate our work SVN repository to Git. I am using the following library to assist with building the git-svn command.
The problem is our SVN repo is set out like so:
svn root/
...
1
vote
0answers
41 views
Word 2010: How to Make Header Info Easily Changeable Across Section Breaks
I have a 10-page document that describes a procedure on how to do something. Each page has a Revision letter in a header, but all pages need to keep the same "Page-1" Revision. Page-7 has a ...
1
vote
3answers
62 views
Automated Version Control - for the business environment
I am trying to establish version control and record for my father at his work, in construction. Just a way for him to track changes to files (bids, quotes, schedules, etc.), and be able to retrieve ...
0
votes
1answer
25 views
Versioning specific text / code (R) files on Windows
I find myself editing R code files on Windows using RStudio. But often I want to keep previous versions in case I make a mistake and want to roll back to a previous version etc.
Right now RStudio ...
39
votes
3answers
16k 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 ...
4
votes
1answer
11k 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 ...
0
votes
0answers
23 views
Sync two sets of folders
I have a desktop which is used as the main work PC and I'm going to be regularly commuting, so I got a laptop for working while away.
The question is how do I sync the two work folders when I leave ...
1
vote
1answer
3k views
How to clone Mercurial repository from remote server?
How do I clone an Mercurial repository if private key is required for SSH?
I tried following and it does not work.
dukeimg@localhost:~/foo/test$ hg clone --ssh -i ~/keys/dukeimg ssh://username@...
1
vote
1answer
809 views
Version control for audio files
What is a good approach for version control of audio files?
I have a 20GB library of audio lectures to tune up and bring in to a state ready for releasing and sharing. It's important to keep the ...
0
votes
1answer
176 views
How might one version control Linux kernel firewall rules?
Our router is CentOS but we just use iptables to modify Linux kernel firewall rules. There is a script that's under version control which resets all the chains/rules, but in doing so drops all ...
12
votes
1answer
5k 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 ...
4
votes
1answer
7k views
git: “pack has bad object” when pushing to remote
I have a bare git repository on my Raspberry Pi which only I use. When pushing to it today, I got this error message:
Counting objects: 460, done.
Delta compression using up to 8 threads.
Compressing ...
1
vote
1answer
1k views
Version control in Word 2016
I currently work on a project which requires data to be written in .on-linear style. As the method is simply trial and error, I've ended up with a folder of Sapara files - one per each version, but it ...
0
votes
0answers
196 views
How can I get latest changes in my Git branch without it appearing like I'm the one committing those changes and still keeping my pull request clean?
In Git, we have a develop branch from which we make feature branches for each feature. I see two ways of merging the latest changes in develop with my feature branch code.
Merge the latest develop ...
0
votes
0answers
560 views
ClearCase does not show as source control option in Visual Studio
We have Visual Studio 2015 and I'm trying to incorporate ClearCase, which we also have, version 8.0.0.16.
I installed Visual Studio Integration through the Installation Manager.
The most recent ...
0
votes
1answer
835 views
Groups and subgroups of multiple git repositories?
Currently, I have a few SVN Repositories, and it looks like this:
Customer1 (this is a proper "SVN Repository")
project1
foo82
trunk
tags
branches
...
0
votes
1answer
42 views
How to clone svn ignore structure?
I have a package with many subfolders. Each subfolder contains different svn ignores. Now I would like to replace all the folder structure with the new package (which does not contain the ignores). If ...
0
votes
1answer
78 views
Git related regarding commits in branches
I have a quick question regarding git commits and branches.
Say that I want to get two commit idn based on two dates.
I do the bellow on the "Master Branch".
git rev-list --since='2015-01-01' --...
2
votes
1answer
131 views
What happens to a branch when the master is deleted?
Say I create a branch of folder Master in my repository and make some commits to it.
I used TortoiseSVN's Create Branch command, which executes: svn copy FROMURL TOURL to create the branch on the ...
0
votes
1answer
35 views
How to set up repository to version different directories
I'm wondering how to go about versioning different directories on my system that can't really sit in one central project/trunk/ directory.
That is, I'm working on a client server with web frontend ...
