When merging branches in a version control system, a merge conflict might arise. This tag is for questions about how such conflicts can be resolved.
Questions tagged [merge-conflict-resolution]
755 questions
13
votes
1 answer
ERROR: Parsing unable to continue due to merge conflicts in Podfile.lock
recently since updating Xcode i have big troubles using podfiles.
I wasn't able to add any new pods to my existing pod file, hence i decide to create a new project and just copy all my stuff inside. But now I have to face the same issues again and…
Alper Maraz
- 139
- 1
- 6
13
votes
2 answers
How to configure 3 way merge feature on compare in Visual Studio 2015
Problem: The default diff/ merge tool in visual studio 2015 (and previous versions) does not allow merging when you compare a file. It only allows you to see differences. The only occasion I'm aware of the 3 way merge option being enabled is when…
TheDev6
- 882
- 9
- 17
13
votes
1 answer
Re-use conflict resolution with Git
Can I tell Git to re-use the conflict resolution from an existing merge commit? I had rerere disabled at the time of commit. The new merge commit contains a few additional commits on the "ours" side of the merge (but they should not introduce new…
knittl
- 246,190
- 53
- 318
- 364
13
votes
2 answers
Git: currently in merge/conflict with private remote repo. How to tell Git to just use my local files?
Trying to use/learn git with a personal project. There's only me and a remote git repo, a few commits, and I'm stuck in a failed merge. A lot of my files have Git merge conflict markup now too.
How do I tell git to just throw everything out, just…
Kache
- 15,647
- 12
- 51
- 79
13
votes
2 answers
Cherrypick commit orders
That might be a naive git question but here it is:
Before doing a pull-request, I usually create a new branch from the latest commits in the upstream and cherry-pick the important commits from my development branch. Then make a pull-request from my…
systemsfault
- 15,207
- 12
- 59
- 66
12
votes
1 answer
Git - Cherry picking with ours/theirs strategy
I wonder if there is any way of cherry picking with ours/theirs strategy. On other words, I want to cherry pick multiple commits from dev branch into main branch with below commands,
git cherry-pick HASH1 HASH2 HASH3 -n
This command is supposed to…
Sazzad Hissain Khan
- 37,929
- 33
- 189
- 256
12
votes
2 answers
why git stash cannot abandon the changes made just now?
i forked a project from github, and the origin point to my own github repo, remote point to its original repo, since i want to get update from remote,
i use git pull remote branch_name, then my local repo is in conflict mode,
now i want to cancel…
hugemeow
- 7,777
- 13
- 50
- 63
12
votes
3 answers
How to stash unmerged code in git?
I did a git pull and found that one of my files needs to be merged.
I don't really want to merge that file right now - I have another branch that I need to work on, and I will get back to this branch later to resolve the merge.
What is the best…
poundifdef
- 18,726
- 23
- 95
- 134
11
votes
1 answer
eGit Merge Resolution - Use Your Copy
I still new to eGit. I'm trying to figure out how on earth to get eGit to resolve a merge conflict using my copy, no change. I'm referring to the notes on the eGit Wiki:
http://wiki.eclipse.org/EGit/User_Guide#Possible_merge_results
However, when I…
Jason Huntley
- 3,827
- 2
- 20
- 27
11
votes
2 answers
How resolve this Mercurial conflict?
I'm frustrated with Mercurial and Python since it makes easy things difficult. I have a trivial conflict and since Mercurial does not give any suggestion what to do I don't know even how to resolve this trivial file conflict:
The conflict is…
Niklas Rosencrantz
- 25,640
- 75
- 229
- 424
11
votes
1 answer
Not getting GitHub merge conflicts Top-bar in Visual Studio Code
I am having trouble getting this GitHub merge conflict Top-bar to resolve the conflicts in Visual Studio Code.
I have tried adding this command "editor.codeLens": true but no effect.
This is what I am getting after pulling the changes
And this is…
bharat8
- 125
- 2
- 8
11
votes
1 answer
Why does GitLab say there are conflicts when there have not been commits to the target branch since the last merge?
We use GitLab.com for our project. We are merging code into our release branch (master) from our QA branch (qa). There have been no commits to the master branch since the last release about a month ago.
For a couple of the projects, the automatic…
Nick
- 4,901
- 40
- 61
11
votes
1 answer
Creation of Merge Request in GitLab fails
I migrated my existing sources from Microsoft SourceSafe to GitLab.
Now I have two branches master and release.
I created a third branch feature off master and committed and pushed this branch.
Afterwards, I created a new merge request, which got…
MxNbrt
- 317
- 3
- 12
11
votes
1 answer
git blame while resolving merge conflicts
I often rebase a large open source project and there are merge conflicts where I need to figure out who made the change and when in order to decide as to which change to take. So generally what I do is that I go to both repos and look at the file…
Salil Surendran
- 2,245
- 4
- 27
- 42
10
votes
3 answers
Git - automatically create distinct files for versions on conflict
When Git detects a conflict during merge, the default behaviour is to fill the file with <<< >>> === markers.
This is OK most of the time, but sometimes I'd like to resolve conflicts differently and I'd just like Git to create distinct…
Kos
- 70,399
- 25
- 169
- 233