All Questions
3,300 questions
0
votes
1
answer
28
views
Embarrassing myself with git merge - adds a bunch of files and commits to my PR that I hadn't touched
Git novice here. tl;dr: I don't understand why already merged commits end up in my PR. Going to number my steps here so people can point out where I went wrong with a number.
So I'm working on a ...
-4
votes
1
answer
70
views
GIT branch of branch causes merge conflicts when original branch has been merged to main
Since about halve a year (new windows install) I have the following issue with git that I haven't noticed before.
I often have a feature branch branched from DEV.
That feature branch (A) gets put in ...
1
vote
0
answers
67
views
Strange characters appearing on merge conflict
I'm working on a French WinForm application and in the team we are using multiple git clients (VS studio, GitKraken, etc.) to manage branches and so on.
I'm currently using Git Fork with the ...
- 11
0
votes
0
answers
33
views
Stop folder from being merged
I have a git repository where I have a "prod" branch and a "dev" branch. I have a just_dev_folder
in dev which I want to completely exclude from prod and I want to be able to merge ...
- 121
-1
votes
0
answers
35
views
How can I check if the current git branch (down to its merge base) is a proper tree?
I want to create a script that makes sure contributors in my project are rebasing their changes before merging, rather than merging first from the target branch before then merging their changes back.
...
0
votes
1
answer
139
views
Why do some merged commits have no effect?
Here is my workflow with git:
A 'master' branch.
A 'devel' branch, that I merge into master when it is mature for a new release.
Several little branches, such as 'imprimerie', 'ordomatic', etc.
...
- 27
0
votes
1
answer
54
views
Merging with meld: hideResolved vs useAutoMerge
As far as I know, there are two options to make meld automatically merge the changes which do not conflict.
What is the difference between both options, and which is preferred?
git config --global ...
- 27k
0
votes
0
answers
41
views
How to Exclude Specific Files from a GitLab Merge Request After Accidentally Merging Deployment Branch Configs?
Problem
I accidentally pulled from a deployment branch (deploymentdev) into our main development branch (main) and pushed it. This brought deployment-specific configuration files (Jenkinsfile, .gitlab-...
0
votes
2
answers
74
views
How to establish a branching relationship between an older commit of one branch with another unrelated branch
I downloaded the source code of a project when it was in state A (see the picture below). It was just normal download resulting in a local source code tree denoted by C in the image. I did not use git ...
- 243
-2
votes
2
answers
78
views
Bring back a branch to be fast-forward merged again
In my codebase we have two branches (relevant to this question) we have main and TestFlight.
When we want to make a release, we do the following
$ git checkout main
$ git pull
$ git checkout ...
- 815
5
votes
1
answer
86
views
Merge two similar Git repositories into new repo
I need to merge two Git repos, Repo1 and Repo2, into a new single repository MonoRepo. The two repos have almost identical folder structures, and many files are very similar or even the same between ...
- 307
0
votes
0
answers
47
views
Git merge does not update target branch with all changes from source
I have branch "feature" with changes that I want merged into my "master" branch with the git merge feature command.
My expectation is that target branch would get overwritten with ...
- 154
0
votes
0
answers
28
views
Show only unmerged files and their states when resolving a merge conflict in Git [duplicate]
I'm running git merge <1st-branch> and got several conflicts that I need to resolve.
Running git status -uno gives me obviously the following output, with both the changes to be committed and ...
- 1,036
-2
votes
1
answer
75
views
How to merge accidently missed release into current branch
The scenario:
It's 2025 right, so we decided to create new branch for this year 2501.x version. And found we accidentally missed some feature branch versions are not merged to our current release i.e.)...
-3
votes
1
answer
95
views
Git squash/merge feature into develop [duplicate]
I have two branches
feature/abc
and
develop
They both have different unrelated histories. I want to squash all commits that are in feature/abc and then merge or rebase the single commit into ...
- 1,122