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.
279
questions
0
votes
0
answers
49
views
How many objects is too many for a git repository?
We are planning to store frequently updated text and graphics in a version control system. It's not source code, but it is mostly text files. No single object is "large", but the size of the ...
3
votes
1
answer
521
views
Rewrite and Resign git commit-history with git-filter-repo
I have an existing private git-repository (with two branches), hosted on GitHub. I plan to make it public, but I don't want to make public the author email-address. So, the plan is to rewrite the ...
- 141
0
votes
0
answers
119
views
Setting up Jenkins to build Azure DevOps pull request
I'm trying to set up my Jenkins instance so that it can fetch pull requests from Azure DevOps repository.
I have created multibranch pipeline, set my repo URL in the Branch Sources settings, and added ...
0
votes
0
answers
4
views
IBM clearcase - Undo checkouts on main branch & for only our own files
I have to undo checkout the files in main branch which failed to merge from task branch, Let consider from TaskBranch I am trying to merge a file to main branch and unfortunately I got a merge error, ...
0
votes
0
answers
36
views
How to remove git tracking but keep file in repo
I do not want to delete the file in the repo.
I do want the file cloned a developers and my machine.
However, I do want to ignore the file from future check in/push.
My goal is that only files that ...
- 3
0
votes
0
answers
144
views
default to Python 3.9
I have an ubuntu 20.04 Desktop that comes with Python 3.8 by default.
How do I make Python 3.9 default Python? I had to install this manually.
When I SSH into the machine I was just run alias python=...
- 145
0
votes
0
answers
30
views
Is it viable to use version control to switch between different versions or variations of a program?
For context, I've been using a heavily customized Atom editor paired with a WSL terminal for several programming classes at university. It started with adding packages for C++, then R, and I ...
- 145
0
votes
1
answer
44
views
In Docker is there a way to maintain (updateable and trackable) "aliases" for images?
In a project with several references to certain Docker-images I want to provide a versionable (i.e git-trackable) way to use common names for Docker-images.
Currently at several places in an existing ...
- 957
1
vote
0
answers
23
views
Git shows modified *.ipynb files, cannot reset, stash or switch branch
I've been having this reoccurring issue recently:
$ git status
On branch foo
Your branch is up to date with 'origin/foo'.
Changes not staged for commit:
(use "git add <file>..." to ...
- 596
2
votes
0
answers
210
views
Excel rows of data suddenly disappeared after undoing deletion of unrelated rows. Version history suddenly blank. Get my data back?
I have been editing an Excel workbook for 6 days. The workbook is saved in sharepoint and also marked to always be kept on my laptop. I have saved this .xlsx file dozens of times in the last few days.
...
0
votes
1
answer
150
views
Prevent merging certain local changes to files in version control in git
I'm wondering what is a good way of preventing certain local changes to be merged to a branch in git.
Concretely, I often find myself wanting to make local changes to source controlled files and have ...
- 127
1
vote
1
answer
33
views
Version control ideas besides SVN or Git?
I'm looking for some version control method or system i could use - but SVN or Git won't work.
I write code, allone, no team
I use several different computers, some private, some from my employer
...
- 295
1
vote
0
answers
50
views
Is there a way to do version controlled operating system back-ups?
I recently messed up pretty badly by removing all 32-bit binaries in my Ubuntu 18.04, of course I'd forgotten to make a back-up. I've had similar issues in the past on Windows as well where I did ...
- 113
1
vote
1
answer
52
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:
...
- 225
2
votes
0
answers
25
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 ...
- 173
0
votes
1
answer
551
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 ...
- 113
0
votes
1
answer
133
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 ...
- 420
0
votes
1
answer
404
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:...
- 7,619
0
votes
0
answers
25
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 ...
- 419
0
votes
2
answers
258
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 ...
2
votes
0
answers
189
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 ...
- 542
1
vote
2
answers
118
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 ...
- 13
1
vote
1
answer
26
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 ...
- 3,725
2
votes
1
answer
320
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 ...
- 21
0
votes
1
answer
31
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 ...
- 195
1
vote
1
answer
3k
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?
- 351
0
votes
0
answers
205
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
1
answer
121
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 ...
- 1,373
0
votes
1
answer
131
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 ...
- 3
0
votes
1
answer
239
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 ...
- 11
2
votes
2
answers
1k
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 ...
2
votes
2
answers
4k
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 ...
- 23
1
vote
1
answer
49
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 ...
- 111
2
votes
1
answer
222
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....
- 121
0
votes
1
answer
776
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 ...
- 131
1
vote
2
answers
96
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 ...
- 599
1
vote
2
answers
1k
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 ...
- 252
1
vote
0
answers
944
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 ...
- 143
2
votes
1
answer
258
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 ...
- 123
3
votes
0
answers
92
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 ...
- 143
2
votes
0
answers
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/
...
- 125
1
vote
0
answers
44
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 ...
- 11
1
vote
3
answers
65
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 ...
- 390
0
votes
1
answer
29
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 ...
- 420
48
votes
3
answers
22k
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 ...
- 611
6
votes
1
answer
18k
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 ...
- 183
0
votes
0
answers
25
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 ...
- 129
1
vote
1
answer
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@...
- 123
1
vote
1
answer
942
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 ...
- 4,804
0
votes
1
answer
199
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 ...
- 257