Stack Overflow
Stack Overflow

Questions tagged [merge-conflict-resolution]

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.

See also

755 questions
0
votes
0 answers

Is it possible to list all the files for which Tortoise SVN resolved conflicts automatically?

When I merge two branches and conflicts occur, in many cases Tortoise SVN is able to resolve them automatically. However, once I click on "Prefer repository" and all merge is completed, I would like to review the files for which the conflict…
matandked
  • 1,527
  • 4
  • 26
  • 51
0
votes
1 answer

vb.net Server error in '/' application after checking out latest version of repo

I'm working on a vb.net application, and have just finished implementing a new feature. The branch that I was working on was a few commits behind production, so although the feature works correctly on my branch, I wanted to update my local…
Noble-Surfer
  • 3,052
  • 11
  • 73
  • 118
0
votes
1 answer

Display 'Resolve Conflicts' window and merge tool in ASP.net MVC View

We are building an ASP.Net MVC web app that interacts with TFS API. When we do a merge through the API, it does not display the 'Resolve Conflicts' window or the internal merge tool window. Can we force this window to come up in an ASP.Net MVC View…
Shruti
  • 107
  • 2
  • 14
0
votes
1 answer

Two branches conflicting when merging back to source branch

Step 1. Baseline branch: master /* file: master.txt */ line 1 line 2 line 3 Step 2. Checkout new branch b1 git checkout -b b1 and edit master.txt as follows, then commit. /* file: master.txt */ line 1 changed line 2 line 3 Step 3. Checkout master…
magento68
  • 26
  • 4
0
votes
2 answers

How to fix a Git master branch after accidently merging the wrong branch?

I have a development branch that I accidentally merged into the Master branch before it was ready. As I did this in error, I decided to revert the changes in Master so that none of my changes where there. This process created a Revert Commit that…
plingingo
  • 121
  • 2
  • 13
0
votes
1 answer

How do I correct this subversion conflict, tree problem?

I have some subversion source I have been working on. When I try to checkin I get the following error. matth@blaze:~/dev/myproj$ svn commit svn: Commit failed (details follow): svn: Aborting commit: '/home/matth/dev/myproj/client' remains in…
hookenz
  • 36,432
  • 45
  • 177
  • 286
0
votes
1 answer

Merge-conflicts Automation

Using CI/CD approach, one of the principle mentioned, here: Automate wherever possible Merging can be done two ways, based on the scenario: 1) Fast-forward merge 2) 3-way merge Does it make sense to think about automating merge conflicts?
overexchange
  • 15,768
  • 30
  • 152
  • 347
0
votes
2 answers

Multiple common ancestors were found and merging them resulted in a conflict

I am performing salesforce deployments. The current setup is: Dev org is pushed from develop1 branch. UAT org is pushed from UAT1 branch. Every 2 weeks we do a Mergeback of UAT1 into develop1. Which is later deployed onto the dev org. This has…
B.T Anand
  • 549
  • 1
  • 13
  • 26
0
votes
0 answers

In TortoiseSVN, can Merge-conflicts occur also after resolving the Update-conflicts?

I work on a branch from a trunk. Before merging it back to the trunk, I update the branch. After resolving the update-conflicts, the branch is merged with the trunk. Do you know if conflicts occur during merge, even after resolving the…
shrin_monk
  • 1
  • 1
0
votes
2 answers

Git (GitLab) - Merge Fails - Trying instructions for "Check out, review, merge locally"

I tried to do a merge from my user-branch to our shared "develop" branch. I'm the only working on this project. GitLab gave me the following instructions which I'm struggling with. in Step 1 - when I did "git fetch origin" - I did it in the…
NealWalters
  • 17,197
  • 42
  • 141
  • 251
0
votes
2 answers

Prevent git conflict markers

I looked quite thoroughly yo find an answer to this and was not able too. Is there a simple way to prevent git from appending conflict markers to conflicted files when merging. I'd like to prevent git from adding "<<<< ==== -----" when there is a…
RBL92
  • 21
  • 3
0
votes
2 answers

Xcode Git Merge project.pbxproj file

I have 264 conflicts in my project.pbxproj file when I'm merging two local branches in Xcode. I tried my best to merge them but for some conflicts I cannot even see the drop down button to select left or right because there are just too many…
Amy L.
  • 210
  • 2
  • 4
  • 14
0
votes
2 answers

The most efficient way to resolve a lot of simple git conflicts

My professor at the university wants each of my classmates to add their name to a file with an attendance list. And my question is what is the most efficient way to do this? Create 22 branches and delegate one person to megre those branches or…
Bartek Chyży
  • 521
  • 9
  • 25
0
votes
1 answer

Visual Studio - adding a file in one branch adds the file to all branches

I've encountered some unexpected behavior in Visual Studio Enterprise 2017 in a .NET Web API project. When I'm in a branch (not master), and I add some new files like a controller and a model, maybe exclude a file or two from project, etc. If I…
Kyle Vassella
  • 2,296
  • 10
  • 32
  • 62
0
votes
1 answer

Resolving conflicts in GIT for a Pull-request on forked repo

In short, i forked a repo, then created a branch from master, did some coding, pushed branch to origin, created a PR, the PR cannot be merged as it contains conflicts [guessing due to the work of other people] <<<<<<< code on master ====== my…
lordZ3d
  • 540
  • 6
  • 20
1 2 3
…
50 51