153,743 questions
0
votes
2
answers
82
views
Is there a way to automatically convert files from UTF-16 to ASCII during git rebase?
I'm in the process of transferring old repositories from visualstudio.com to GitHub. The repos used to be private and contains user names and email addresses that should not be made public. Thus I ...
- 33
0
votes
0
answers
84
views
How to apply a git diff patch?
Trying to run some tests on core codebase locally, I did the following:
git clone https://github.com/home-assistant/core.git
# create & activate venv ...
# Go to base commit
git checkout <...
- 13
-5
votes
1
answer
127
views
My first encounter with error in git logic [closed]
Has any one seen git's logic of managing version got broke?
Recently
I was making changes in just one line of a python file
There was a dict
{
"background_color": "#a20000e3"
}
I ...
0
votes
0
answers
63
views
Git log graph script to run on any repo [closed]
I am trying to create a Bash script that produces an enhanced, readable git log graph for a repository with multiple branches.
What the script is intended to do
Fetch and prune all remote branches.
...
- 1
-3
votes
0
answers
113
views
Why does "git pull" locally add uncommitted changes to the Git index? [closed]
I have a Go project.
Today, I performed a "git pull" on the microservice repository, and uncommitted changes to the "go.work.sum" file appeared in my Git index.
I've never had this ...
- 41
-3
votes
2
answers
110
views
Git pull rebase ignore new changes [closed]
When I do git pull --rebase, it will try to merge upstream into my local changes. I don't want it to do this. Instead, I want to ignore all new changes, and act as if my local changes undid the ...
- 9,470
-4
votes
1
answer
123
views
Exclude everything except certain files using a single .gitignore, with nested repositories
Preface: this involves nested git repos! See end of post for context on this
I have the following folder structure:
.gitignore
sub/file.json
other_files
Both the root folder and the folder sub are ...
- 10.4k
-4
votes
1
answer
89
views
Force-added file doesn't show in status [closed]
There is a picture saved in a pdf that I would like to add to my git repository.
It is named pictures/number_products_per_bitsize_1.pdf.
ls pictures
ibraries-single-thread-square-review.pdf ...
- 373
2
votes
0
answers
92
views
How to skip binary file types when cloning a Perforce repository with git-p4
I have a huge Perforce repository that contains many large binary assets in addition to code.
I want to use git-p4 to "convert" this repository's history to Git, so I can use Git-specific ...
- 2,412
1
vote
1
answer
85
views
Get default remote for git switch
Let's say, for example, I have 3 remotes defined in my .git/config in the following order:
remote3
remote1
remote2
Also, checkout.defaultRemote may or may not be set.
Then, there is a branch ...
- 5,181
0
votes
1
answer
96
views
Git .lock file not found
I am trying to do a git fetch (or any other Git command) and I get the following error:
fatal: Unable to create '/path/to/repo/.git/refs/remotes/origin/main.lock': File exists.
There are no .lock ...
- 29
Advice
1
vote
7
replies
188
views
Best sites to gather cheat-sheets/notes
I am someone who likes to study via online notes and documentation, but I would really like it if there were a website with a collection of short notes and/or cheat sheets so that I can revise the ...
- 1
Best practices
1
vote
1
replies
45
views
Multi repository synchronisation for deployment
For a crew project I have 2 gitlab repositories (backend and front-end) and I'd like to improve my CICD. As of now, when I merge a PR, it deploys on a ""development environment"" ...
- 379
Tooling
0
votes
1
replies
51
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 ...
- 172
-5
votes
0
answers
67
views
IntelliJ marks files as modified when I add tabs/spaces — how to stop this? [closed]
In IntelliJ IDEA, whenever I press Tab or add spaces, the file is marked as modified even though nothing meaningful has changed. This creates noisy diffs and clutters my GitLab merge requests with ...
