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
0
votes
1 answer
Does git rebase and or git merge create filed with conflicts marked up?
After I got message about existing conflicts, I found that files with conflicts contain marks like
<<<<<<<<<<<<<<<
or
>>>>>>>>>>>>>>>
Is this correct? What is the name of this file format?
Dims
- 47,675
- 117
- 331
- 600
0
votes
1 answer
How to do a BitBucket Pull Request Conflict Resolution in IntelliJ IDEA
So, lets say I have development branch, and opened a PR for my feature branch into development.
I have a conflict in say, 1 file (or 10, whatever) - bitbucket says what I need to do:
git checkout development
git pull origin feature
...Do merge…
Carmageddon
- 2,627
- 4
- 36
- 56
0
votes
1 answer
Making shelveset, local, and result line up in Visual Studio mergetool
I'm using Visual Studio's built in merge tool to resolve a conflict after I unshelved a shelf when I already had local changes.
However, a line of code (for example the start of a function) is currently appearing near the top of my "local" window,…
Andrew Grimm
- 78,473
- 57
- 200
- 338
0
votes
0 answers
Gitlab - disable interactive mode conflict resolution
After every release we merge the release branch back into master.
I noticed though that when there are merge conflicts between a release branch and master, an additional commit is added on top of the release branch (even if these are protected…
Gabe
- 5,997
- 5
- 46
- 92
0
votes
2 answers
vsDiffMerge not running as Sourcetree external merge tool
I'm trying to set up vsDiffMerge (from Visual Studio Professional 2017) as my external merge/diff tool for SourceTree. However, when I try to resolve merge conflicts with the external tool, nothing happens. I know I got it to work before, but I had…
inejwstine
- 678
- 1
- 10
- 30
0
votes
0 answers
git: re-merge single file while ignoring line endings
I have a git merge with many conflicts. For one individual file, I'd like to re-merge it while ignoring line endings.
Put another way: I'd like to run git checkout -m file with the behavior of git merge -Xignore-space-at-eol. Is this possible?
Kevin Smyth
- 1,892
- 21
- 22
0
votes
1 answer
Repeat code moves to alleviate merge conflicts
When encountering conflicts during merging, git presents file-based conflicts instead of actual conflicts within moved blocks of code (across files).
It's often the case that we have simple modifications within the moved code. To perform the desired…
sevo
- 4,559
- 1
- 15
- 31
0
votes
1 answer
Is it possible to force a target override when starting a MergeRequest on Gitlab?
I am trying to implement a CI pipeline where development is merged to a release branch which, in turn, is merged to master.
The release branches are named x.y.z and reflect the version number of the release.
The release job modifies the pom to…
paul
- 13,312
- 23
- 81
- 144
0
votes
1 answer
How to avoid so many merge conflicts in this situation?
I understand that a merge conflict arises when there are "competing" commits. In the situation where there is only one repo branch, and there are two contributors, both with write access, I suppose the merge conflict gets realized when the second…
Taylor
- 1,797
- 4
- 26
- 51
0
votes
1 answer
Merge two tables from two databases in different servers
I am developing a mobile app that will be able to work in offline mode.
I have an online application that consumes a table called "Books" in a database located on a server, and my mobile app has a sqlite database with the exactly table "Books".
When…
Alan Nunes
- 163
- 4
- 15
0
votes
2 answers
Is there an way to find the history of a deleted folder in bitbucket , if it was deleted in a merge?
One folder ,'xyz' in tests folder was deleted in a code merge.
As it is a code merge, I am not able to see and prove that the folder 'xyz' was deleted in merge.
This information is not seen in history as well.
Is there any way to get this log or to…
Sapna
- 391
- 2
- 3
- 19
0
votes
1 answer
How can I merge only renamed files in git?
I have two branches feature and master. I haven't worked on the feature branch in several months and the directory structure of the master branch has changed quite a bit.
I am trying to merge the master branch into my feature branch. Since there are…
Ddor
- 347
- 1
- 12
0
votes
2 answers
react native Manifest merger failed
After adding react-native-admob library I got next error message
Manifest merger failed : Attribute application@appComponentFactory value=(android.support.v4.app.CoreComponentFactory) from [com.android.support:support-compat:28.0.0]…
Viktor Hardubej
- 390
- 7
- 16
0
votes
1 answer
Acumatica: Conflict between customization projects
Error validating customization due to conflict between projects.
I set the level to 99 for one project.
My code is very simple. I am flipping the Status in Vendor Maintenance to "H" if certain fields are updated within Vendor Maintenance, but it…
Rowan
- 55
- 1
- 5
0
votes
1 answer
Badly merged commits
I've had git behaviour that I quite didnt understand:
I have production branch B1.
git checkout B1
git checkout -b B2
I work on a solution, merge it with B1 localy with
git checkout B2
git rebase B1
git checkout B1
git merge B2
git branch -d…
Yurkee
- 795
- 2
- 9
- 23