17,210 questions
Advice
0
votes
5
replies
124
views
How well does git work with binary files?
How well does git work with binary files?
Suppose I have a photoshop file, and for some reason I'd like to save copies of multiple version of my progress.
Currently, I would just save multiple files ...
Advice
0
votes
3
replies
101
views
VS Code Source Control ignores nested Git repository directory in parent repository view
I have a project containing some private files, such as API keys, database files, and personal settings, stored in different directories
To keep a versioned backup of those files that I can clone on ...
Advice
0
votes
1
replies
136
views
How are reconstructions of development releases of AOSP/Android versions made?
This may be offtopic here, but I was looking on betawiki.net and found 'reconstructions' of Android development versions that weren't publicly released, up to Lollipop 5.0. I suspect that they were ...
Score of 2
1 answer
84 views
How do I revert only specific files from a previous commit in Diversion?
I am using Diversion for an Unreal Engine project and I accidentally committed changes to a few .uasset files.
I do not want to revert the entire commit, because the commit also includes other files ...
Tooling
0
votes
13
replies
140
views
Git automatically identifying the common ancestor for an "onto" rebase
An integral component of my workflow with Git is to rebase one branch onto another branch, that is, to invoke the rebase command with the option --onto.
Even with the option, it is required to specify ...
Advice
0
votes
5
replies
73
views
Cross-repository development
Are cross-repository Git commits possible, perhaps with Git modules?
As of now, since much of the development involves multiple Git repositories, I don't create task branches, e.g. #123. I would have ...
Score of 1
1 answer
66 views
How to model partial file promotions from a file-version SCM in Git while preserving authorship?
I’m trying to migrate history from a file-version SCM (like AccuRev or ClearCase) into Git while preserving per-file authorship (git blame should reflect the original authors).
In file-version systems,...
Advice
0
votes
2
replies
114
views
Keep "duplicate" files after translation in git instead of merging them
I've got a git repository published on GitHub. It has provided a web-based tool in English language. The software was not prepared for internationalization and localization.
Another user has ...
Advice
0
votes
1
replies
94
views
Is there a way to track and verify open-source contributions beyond GitHub’s contribution graph?
I’m a CS student working on open-source projects, where much of my work (forks, private repositories, code reviews, documentation, and issue triage) doesn’t appear on GitHub’s contribution graph. Are ...
Tooling
0
votes
1
replies
67
views
Development / Deployment workflow recomendations
I'm looking for Process improvement recommendations.
Today, we have a dozen lab fixtures for setting up hardware.
Most hardware setup is done by python scripts, we have a very small team with no real ...
Best practices
1
vote
3
replies
94
views
Resign commits without losing dates
I don't have access to the GPG key right now. How can I make commits and then sign them on another computer? I know about git rebase, but it's important to me that the dates in the GitHub repository ...
Best practices
5
votes
3
replies
128
views
How does one correctly version a Wordpress project?
I have been wondering how to version Wordpress projects correctly.
Versioning the entire Wordpress directory? I'd be versionning a lot of code that's not mine (Wordpress core, theme(s), plugins...) ...
Advice
1
vote
3
replies
134
views
Is there a way to use a custom diff algorithm in Git?
One really common issue I encounter is that Git is purely text-based, and doesn't know anything about the language of the file it's tracking. Most of my time spent resolving merge conflicts is fixing ...
Score of 0
1 answer
102 views
How to filter git log by relation of the parent commit?
I want to filter the commits shown by git log --graph, so that the commits included are either reachable only by the first parent (--first-parent) [type A] or which are not reachable, whose first ...
Score of 1
0 answers
82 views
How do I retain all files from different heads in a mercurial merge?
Consider the following repository example -
hg init
echo "1" > 1.txt
hg add
hg commit -m "Added 1"
echo "2" > 2.txt
hg add
hg commit -m "Added 2"
echo &...