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
1 answer

Git merge driver is beeing executed without a conflict on some files

From time to time our custom merge driver is executed on files that did not conflict (They don't have any conflicts if you remove the merge driver, so in the merge driver you can just do a git merge-file and everything works great). We are using Git…
BlackEye
  • 775
  • 11
  • 25
0
votes
0 answers

.pbxproj merge conflicts without git marks

I just pulled from remote repo to my local repo and .pbxproj merge conflict happens. However when I opened it I didn't find any git marks( which means <<< === >>> ) so I don't know how to resolve this conflict. Any idea?
Leo
  • 492
  • 1
  • 5
  • 15
0
votes
2 answers

Fixing messed up git branch

We're running GitLab as our central Git repo and using TortoiseGit locally along with VS2010 SP1 as our main IDE, developing ASP.NET application. We've transitioned from TFVC to GIT 2 months back and we are still newbies. We branches on every bug…
faulty
  • 8,117
  • 12
  • 44
  • 61
0
votes
1 answer

What are the first few steps to resolving a merge conflict on GitHub and Git?

I came across the first merge conflict of my team. First my team member updated his branch and it was merged into the master branch. I pushed my changes via commits, then I did a pull request. GitHub says "This branch has conflicts that must be…
Mark A
  • 1,995
  • 4
  • 18
  • 26
0
votes
1 answer

Complete file changed git

I am currently working with a Xamarin project, where all file references are put inside one project file. This file changes each time someone on our team adds or removes a file. Now I have gotten a few conflicts in the last days, where my colleagues…
vrwim
  • 13,020
  • 13
  • 63
  • 118
0
votes
1 answer

TFS - TFPT - how to resolve conflicts when applying a shelveset from a branch to another?

I'm trying to apply a shelveset from a branch to another, following these steps: http://benjii.me/2014/04/move-shelveset-to-different-branch-in-tfs/ But when TFS opens a screen for me to resolve conflicts, it's impossible to work, because my…
user1389591
0
votes
1 answer

How can I mark a file conflicted

I've been working on a project with another developer and he recently committed and pushed a file that was conflicted and unresolved. Furthermore, he merged this file to our main branch. Today I, after numerous commits, pushes, and merges, noticed…
Tanshaydar
  • 28
  • 4
0
votes
1 answer

^M being inserted into all my code by git

I'm using Bitbucket and I don't know if that is important. Why is ^M being inserted after every line of my source code after merge conflicts. I'm not using Source Tree, just regular git through terminal.
Alexander Kleinhans
  • 5,950
  • 10
  • 55
  • 111
0
votes
1 answer

How to list merge conflicts on origin that are not on local?

Stash is rejecting my pull request due to merge conflicts. So I create a merge branch, merge destination into the merge branch, (there's nothing to commit), push anyway and open the pull request again. Still rejected for conflicts. I've deleted…
Robert Kerr
  • 1,291
  • 2
  • 17
  • 34
0
votes
1 answer

Can't change branch: merge conflict because of (already?) untracked file

I already had the problem that I couldn't check out a branch (see here). After I forced the checkout (git checkout master -f) and did the merging and tagging, I now want to switch to the develop branch back. This is what I get: git checkout…
testing
  • 19,681
  • 50
  • 236
  • 417
0
votes
2 answers

How to detect manually resolved conflicts in git

In my git repository, I had a file which someone merged by choosing their own version over the master version. He also changed the commit description and deleted the 'Conflicts:' part of its description. Is there any way that I can use git log or…
tohava
  • 5,344
  • 1
  • 25
  • 47
0
votes
1 answer

Bitbucket, Mercurial - resolving merge conflicts when syncing a fork

master (read-only) |--- myFork (write) |--- otherFork01 (read-only) |--- otherFork02 (read-only) . . . I've used Mercurial as a VCS (had to), committing to myFork. Now Bitbucket is letting me know that I'm a couple commits behind master…
User1291
  • 7,664
  • 8
  • 51
  • 108
0
votes
1 answer

Git merge for 2 branches

There is a branch A. I branched from branch A so I have a branch B. I branched from branch B so I have a branch C. In a while the file file1.js was changed in A, file1.js (not file2.js, but the same file1.js) in B and file3.js in C. Then B was…
Haradzieniec
  • 9,086
  • 31
  • 117
  • 212
0
votes
2 answers

Git incorrectly marking conflicts as resolved

Something is causing Git to automatically "resolve" merge conflicts. Below is the actual, line for line output of an attempted merge: >> git status On branch BRANCH-A Your branch is up-to-date with 'origin/BRANCH-A'. nothing to commit, working…
gpanders
  • 1,301
  • 2
  • 15
  • 23
0
votes
2 answers

How do I commit everything that git automatically merges? (temporarily ignoring conflicts)

I'm in the middle of a git merge --squash --no-commit operation. Some files were successfully merged by git, while some other files are indicated as "both modified" (unmerged changes). I want to commit everything that git was able to merge…
William
  • 2,695
  • 1
  • 21
  • 33
1 2 3
…
50 51