17,217 questions
- Bountied 0
- Unanswered
- Frequent
- Score
- Trending
- Week
- Month
- Unanswered (my tags)
Advice
0
votes
2
replies
98
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
55
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
55
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
67
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
4
votes
3
replies
79
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
84
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 ...
0
votes
1
answer
77
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 ...
1
vote
0
answers
67
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 &...
-1
votes
3
answers
104
views
How to cut and splice two sequences of Git commits so that A-D and B-C become A-B-C-D?
We're migrating from SVN to Git using "git svn clone" followed by post-cleanup with some git-filter-repo scripts. So we're already rewriting history, and we don't need backwards interop ...
0
votes
2
answers
119
views
Safest way to resolve push conflicts and messy commit history after rebasing local branch with updated main?
I recently rebased my local feature branch onto the latest main branch to get up-to-date. Now, my commit history looks all weird—some commits seem duplicated or out of order, and when I try to push, I’...
-1
votes
1
answer
89
views
How can I modify a git branch merged from multiple other branches, then propagate the changes back to the correct origin branches?
I have a dozen feature branches that I would like to manually test at the same time by merging them into a single test branch, to avoid repeating the overhead of setting up the test environment for ...
0
votes
1
answer
58
views
core.filemode is true but git still not tracking executable bit
How can I force git to identify changes to the executable bit in a file? I have unset and set the core.filemode flag at the local and global levels, but permission changes to the executable bit still ...
1
vote
0
answers
26
views
How to remove a directory (from tracking) that has been deleted alread
I removed a sub-directory and all its files (rm -rf foo) in a project but hg status still shows them with '!' and I can't amend/upload because of that.
project/$ ls foo
a.c b.c Makefile
project/$ rm -...
1
vote
1
answer
77
views
How can I get other application versioncode in Kotlin?
I'm synchronizing 2 apps and what I'm trying to do right now is version control. Is there any way to get the version number and version code of another application from my own application in Kotlin? I ...
-2
votes
1
answer
256
views
How to organize messy GitHub repositories into folders or categories? [closed]
A few years ago, I learned Python, and in the latter half of the course, I also learned Git and GitHub. At that time, I pushed all my local folders to GitHub without thinking about organizing them ...