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.
265
questions
0
votes
0answers
11 views
Computer crash while using Atom unlinked my project from the remote repository
I was working on a project in Atom that was already linked to a remote repository on GitHub when my system locked up. Now, when I open the project, it says that "You are not currently on a branch," so ...
0
votes
0answers
11 views
Emacs: move cursor to next/previous edited lines/hunk
Mostly when I'm editing code, I need to jump to lines I've edited before. Lines that are highlighted with, e.g., diff-hl-flydiff-mode.
Is there a way to move the cursor to the next changed hunk in ...
0
votes
0answers
14 views
Perforce streams
Is it possible to populate a stream depot from a normal depot in perforce?
I have a stream depot. I need to populate a stream of Development type from another local depot .
Is there a way to do it?
0
votes
0answers
15 views
Custom modify git diff to obtain sha, commit message and changes only
I have a list of git commits (around 10), i want to view the changes made between two dates:
Currently, I am using git whatchanged (see below pic). But it displays lot of unwanted information like:
...
0
votes
0answers
13 views
gitlab branch testing before pushing into master branch
I am new to git.
I have one repo which I had cloned into my local system, made my changes and have merged my private branch but have not pushed it to master branch yet.
I am not willing to push it ...
1
vote
0answers
24 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
11 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
0answers
7 views
How to delete a folder from Tortoise SVN revision
I accidentally created a new folder (empty and unneccessary) in my project, and commited it, so it is now uploaded on the SVN.
The problem is, with this new folder now existing in the head revision, ...
0
votes
1answer
30 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
38 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
49 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
24 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
83 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 ...
0
votes
0answers
395 views
`git merge -s subtree` always returns “fatal: refusing to merge unrelated histories”
Maybe I'm not fully understanding how git merge -s subtree works, but when I use it I always get the error "fatal: refusing to merge unrelated histories". (I've been following the following tutorial)
...
1
vote
1answer
332 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
1k 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 ...
0
votes
0answers
99 views
Modifying shelved CL in Perforce by other users
I am trying to collaborate code between a small team using p4 shelve.
(we can't create a new branch)
Is there a way to modify a shelved changelist by another user?
according to the answer found here :...
1
vote
1answer
20 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
26 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....
0
votes
0answers
19 views
Different commit messages depending on which machine I commit from
I'm using eclipse to write java programs. Currently I use my desktop to program at home, and a laptop when I am in school. For version control I use git. When committing using eGit in eclipse, it uses ...
-1
votes
1answer
141 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
78 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
1answer
629 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
581 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
130 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 ...
1
vote
0answers
53 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
1k 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
38 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
57 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
23 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 ...
28
votes
1answer
10k views
Setting up an encrypted git repository
Situation
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 ...
1
vote
1answer
5k 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
2k 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
604 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
146 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 ...
10
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 ...
3
votes
1answer
4k 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
806 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
184 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
529 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
706 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
39 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
73 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
120 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
34 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 ...
1
vote
0answers
345 views
How can I prevent my reviewer name from converting to “Author” after saving a Microsoft Word document on Mac's MS Word 2011?
Upon insertion of a comment or revision change Microsoft Word documents correctly reflects my User Name as the reviewer. However, after I save the document, all of my comments and revisions are ...
5
votes
0answers
3k views
How do we view and resolve the difference between my version and the server version of a file?
In our MS Office Upload Center, I have a file:
Name MyFile.docx
Location d.docs.live.net/2234hksjdfhk2j34/Documents/Work/ (this is OneDrive)
Last in Sync 10/26/2014 2:50 PM
Status Please Refresh
In ...
1
vote
1answer
3k views
Google Chrome Downgrade
I want to Downgrade my Google chrome version 37 to chrome version 35 for some purposes. I've been disabling the Google Update Services from services.msc and downloaded a stand alone versions but its ...
2
votes
1answer
660 views
How to push changes from a live deployment web server back to the git repository
I'm working in an environment where the developers work directly with script and image files on the live deployment web server. This is scary and has caused a few, though so far surprisingly few, ...
