556 questions
4
votes
1
answer
57
views
Is it possible to identify merge commits that had conflicts after the fact?
I am trying to collect a dataset of merge conflicts based on programmatic command line interactions. The program should run in the terminal, I am fine with using external tools as long as they are ...
- 187
0
votes
0
answers
27
views
How to solve yarn.lock deleted in HEAD and modified in parent conflict?
I tried git revert, and have deleted yarn lock.
git revert --continue
[task/6.1/APIT-7-docusaurus3 41f44ce10d4] Revert "fix docusaurus broken link and code block rendering"
5 files changed, ...
2
votes
1
answer
81
views
Git get theirs commit hash
When git working tree is in conflict state during merge/rebase/cherry-pick, it's possible to get ours/theirs/base version of individual files by several ways, e.g. git checkout --ours/--theirs path/...
- 7,773
0
votes
0
answers
61
views
Code disappears in target branch on git merge w/o any indication
I'm having a problem with Git merge. In short, I'm merging the master branch into a feature branch, essentially git checkout feature && git merge master.
This is how it looks graphically:
...
- 4,460
-1
votes
1
answer
82
views
Merging master into feature branch with conflict resolution
Let's say I have a feature_branch that is based on master and contains commits D and E. Afterward, master receives two new commits, F and G :
master: A---B---C---F---G
\
...
- 23
0
votes
1
answer
30
views
Is there a git option to show the parent line of a source code when merge conflict occurred?
Is there a git option to show the parent line of a source code when merge conflict occurred?
I want to see the line like == line below:
== value = aws_instance.www[*].public_ip
- value =...
- 25k
0
votes
1
answer
103
views
git merge conflict - common ancestor too old
We use Azure devops for development, there are 2 branches: stable and release.
When do development we create feature branch from release and create PR to merge it back to release (by default sqush ...
- 767
-2
votes
2
answers
107
views
Why Git can't merge on the server-side if there are no conflicts
I've been using Git for a long time in a lite mode: branch, pull-commit-push, merge. Mostly with SourceTree. That was enough for development. So I'm an amateur)
But now I've got a repository that is ...
- 842
0
votes
1
answer
103
views
Git merge does not take all files from source branch
I have two branches, 'master' and 'develop'.
Other branches have been merged into 'master'.
Now, when I merge 'master' into 'develop', some files from 'master' are not carried over into 'develop'.
How ...
- 96
-1
votes
2
answers
73
views
Git - Update feature branch without redoing previous conflict resolutions
In git I have a feature-branch which I just rebased of master. There were many conflicts and it took me a couple of days to get the feature-branch up and running with the latest changes from master.
...
- 111
0
votes
1
answer
63
views
Git squash old commits
I have a git log like this
* cb0bfd5 (HEAD -> feat/nuxt, fork/feat/nuxt) Split into icons
* f2d2410 fix: buttons spaces & move layouts to components (#3)
* 881d4ab Split into Components, ...
-4
votes
1
answer
108
views
Resolve merge conflicts when rebasing without manual intervention
Let's have a file readme.txt and such a branch structure
master
|
branch_a
|
branch_b
How this structure is organized:
When we are in master:
git checkout -b branch_a
echo "a" >>...
- 3,823
0
votes
1
answer
80
views
How to make a Git custom merge driver automatically stage resolved files?
I've been trying to set up a custom merge driver for merge conflicts in Git and have it mostly working, but can't figure out why it doesn't automatically stage successfully-resolved conflicts like the ...
- 433
0
votes
0
answers
53
views
unexpected commits records from another merged branch emerged after merging main on a branch
branches illustration
If possible, pls read the image, I think it is easier to understand
git rebase --onto main HEAD~7 caused unexpected commits rather than a single "merge commit"
All PRs ...
user21262497
5
votes
1
answer
85
views
Can I write a specific rule about how git should handle a specific commonly occurring merge conflict in a specific file?
I have an Obsidian vault under version control, and one of the plugins synchronises with an external source, updating a timestamp in the config file.
I switch between two separate user accounts for ...
- 12.5k
0
votes
0
answers
79
views
Jupyter Notebook (.ipynb) Not Opening as Notebook in VSCode After Merge Conflict
I'm using VSCode for my Jupyter notebook development, and I encountered an issue after attempting to git stash apply that resulted in merge conflicts. The conflicted .ipynb files now open as JSON ...
- 1
1
vote
1
answer
112
views
Show a combined diff of a merge commit, including added files by either parent branch
After doing a merge which includes changes of a coworker, I want to them, to outline wheat each of us changed and how I resolved the conflicts.
The standard way that git displays merges, however, is ...
- 3,235
1
vote
1
answer
620
views
Unexpected Git incoming/outgoing conflict in Visual Studio Code
I develop an app using Visual Studio Code on my computer, and I use the Source Control function to sync the code on a GitHub account.
I've never had any issue using the basic functions: I commit my ...
- 107
0
votes
0
answers
51
views
Can I use the .gitmodules file instead of gitlinks to store submodule commits
The origin URL of a git submodule is saved in the file .gitmodules while the commit of the submodules is stored in a git tree as a special entry called "gitlink". This two-components system ...
- 3,235
-2
votes
1
answer
36
views
How does VS Code implement 'accept both' when resolving git conflicts?
I need to implement a custom git merge bash, and I want it like VS Code's 'accept both' function. Does VS Code use some utils or AST parse tool?
Hope someone can tell me some ideas, I need to ...
0
votes
0
answers
48
views
Is there a git merge strategy which can resolve next merge conflict?
TLDR;
On master branch the discourse section was removed
On dev branch the fddkim section was removed
dev branch is being rebased on top of master
A merge conflict happened
I am looking for an ...
- 25k
1
vote
0
answers
98
views
How best to merge many git branches appending to a single file?
I have a repo with some automation that's failed badly. The automation should retrieve a file from the git repo, append "a record," which is multiple lines, push up a new branch, open a pull/...
- 1,569
1
vote
0
answers
46
views
Bizarre behavior when I amend a commit [duplicate]
I hope someone can tell me what Git is doing to me.
First, a caution: the stuff in this repo is totally proprietary.
I doubt that I could sanitize it without changing it so much that the problem goes ...
- 753
3
votes
0
answers
60
views
Best practice for managing requirements.txt in develop/main branches?
Our product uses a requirements.txt file to specify required third-party packages.
In the development code branch, our practice is to not use any pinned versions in this file, so that we always get ...
- 33.3k
0
votes
0
answers
42
views
Merge conflict error using kidff3 as mergetool
enter image description hereMerging:sample-project/sample-project/index.html
mv: cannot move 'sample-project/sample-project/index.html' to './sample-project/sample-project/index_BACKUP_2001.html': ...
1
vote
0
answers
118
views
Git merge strategies vs. merge drivers vs. mergetools
Both Stack Overflow answers, and various webpages, give contradictory or conflicting definitions of "merge strategy", "merge driver", and "mergetool".
Here is my best ...
- 8,077
0
votes
0
answers
61
views
Gitlab. Always conflicts, but no differences in files
(This maybe should go into one of the related boards. StackSomethingelse?)
At work, we routinely merge our feature branch into develop, and then the develop branch into qa. Initially, develop and qa ...
- 419
0
votes
1
answer
105
views
Git cant create pull request | different commit histories | bfg --delete-files | git merge --allow-unrelated-histories
For the past year we've been working with a staging and master branches, testing our changes before merging to master.Now when trying to pull request from staging to master I'm facing an error message ...
0
votes
1
answer
55
views
TortoiseGit stuck in "merge mode", cannot restore pull option in menu
This is related to this question about why the pull option in the TortoiseGit menu is missing - a (conflicting?) merge is in process, so pull is hidden from the context menu. But when I try both ...
- 3,947
1
vote
1
answer
115
views
How can I fix a merge conflict from the Github website?
I was on a branch called make-monolith-ids-constant.
I ran these commands in the terminal.
git checkout make-monolith-ids-constant
git fetch origin master
git rebase origin/master
I now have a merge ...
- 27
0
votes
0
answers
66
views
GitFlow for feature split in sub branches
Another GitFlow question for you :)
Can you help me understand the right procedure to apply in the case below?
I want to start the development of a new big FeatureA starting from the develop branch.
...
- 53
0
votes
1
answer
90
views
Git Conflict Resolution Challenge: How to restore last saved code after conflicts
I am encountering challenges in resolving conflicts in my React Native project using GitHub Desktop and VSCode. I worked in a branch fonts-and-colors that is forked from main. I was going to commit ...
- 41
0
votes
0
answers
87
views
Best way to resolve conflict between feature and test branch but without affect the main?
Let's say you have 3 branches:
feature => branch you add the implementation
test => other developers merge their implementations to test branch to test it
main => main branch, implementation ...
- 932
0
votes
2
answers
188
views
How to resolve git conflict locally (with some constraints)?
I want to resolve a git merge conflict (between feature and test branches), but there are some limitations:
cannot push directly to test and master branches
cannot merge feature branch into the test ...
- 109
1
vote
1
answer
120
views
How to Auto-Resolve Git Subtree Conflicts with Three-Way Merge Strategy?
Hello Stack Overflow community,
I'm currently dealing with a scenario involving Git subtrees and conflicts. Here's a breakdown of my situation:
I have a repository A that includes repositories B and C ...
0
votes
1
answer
199
views
git reports merge conflict although files are the same
I have a master branch and development/Server branch in git.
I created Pull Request and trying to merge development/Server to master branch but I am facing conflict.
I am getting conflicts for 2 files:...
- 39
0
votes
0
answers
70
views
Detect conflicts before merging files that will cause conflicts in the future
Prerequisite
Developing the same repository with multiple (3 ~ 5) developers
Each developer works on a different branch. When work is finished, it is merged into the main branch.
What is the ...
- 1
1
vote
1
answer
288
views
git: How automatically merge non-conflicting changes in the same file?
I am trying to resolve a git conflict.
Let's say I have a file versions.json which is already existing in the repo:
{
"a": {
"name": "component-a",
"...
- 990
0
votes
1
answer
116
views
Git manual merge with binary files using propriety merge tool. How does git mergetool work?
I have a Git repo containing a CodeSys 2.3 source code file. This is a proprietary binary file that can't be merged easily using the tool built into Git. When I attempt a merge and the Auto-merge ...
- 41
0
votes
0
answers
80
views
Merge Conflict is not showing up on VS Code
I am starting to learn Git. I'm watching a video and learning from it. Right now I'm learning merge conflicts. I have a file in my GitHub repository and I have the same HTML file downloaded onto my ...
0
votes
1
answer
80
views
IntelliJ doesn't show code comparison when selecting Resolve conflicts
I tried to rebase from my 'develop' branch (name of my main branch) and I have some conflicts. But I only get this dialog:
On a colleague's laptop if I double or triple click on the file it opens the ...
- 43
3
votes
1
answer
383
views
Git simple conflicts automatic resolution
According to JetBrains IDEs (IntelliJ IDEA, etc.), simple conflicts means non-overlapping character changes within the same line:
For simple conflicts (for example, if the beginning and the end of ...
- 696
-1
votes
1
answer
80
views
Github: Why revising a csv file in a branch results in a conflicting merge?
I'm sorry for this very basic question but I can't understand why revising a csv file that I pulled from the master would create a conflict in my pull request.
What happened is, I have a collaborative ...
- 119
3
votes
0
answers
1k
views
VS Code Merge Editor doesn't get populated
I tried to git pull but couldn't because I got conflicts. There is a button on the file saying "Resolve in Merge Editor".
When I click it, Merge Editor opens (the three-window one) but it ...
- 49
0
votes
0
answers
38
views
git merge conflicts due to reverting: what strategies can be used to avoid such conflicts?
this images describes the issue we were facing
branch k had merged b2 into itself, which was a mistake, we actually did not want any b2 related changes going into k.
then k merged itself into b1, ...
- 8,305
1
vote
2
answers
110
views
Pop conflicting Git stash while keeping stash index
Explanation:
I make a heavy use of Git staging area to keep track of the changes that I'm already sure of while the working directory is often a mess of untested solutions, TODOs and a code that is ...
- 4,795
0
votes
0
answers
127
views
"git rebase master" is finding conflicts in files only in my branch and not master
Here is my problem:
I branched off master, naming the branch other_branch.
I worked a long time on my branch, rebasing daily
we tabled the project for a month
somewhere during that time, it appears ...
user483040
1
vote
1
answer
339
views
How can I keep a solved git conflict in a different branch?
Our team's branching strategy is a mix between git-flow and trunk-based. A feature is developed in a branch, then deployed to a staging environment for approval, then merged into master and deployed ...
- 9
1
vote
0
answers
197
views
How to resolve rename/delete git conflict in favor of their delete during a pull
TL/DR
How can we make git merge prefer their deletion over our move ?
I tried
git merge origin/develop --strategy-option theirs
but this results in (trimmed)
$ git merge origin/develop --strategy-...
- 1,273
0
votes
1
answer
470
views
Git Merge takes all files into the PR after fixing conflicts
I have been looking for this, but not able to find a concrete answer which works.
Say I am working on my branch - branchA and I have a Pull request (PR) ongoing with it.
Some updates happen on the ...
- 361