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: Can there be merge conflicts on a file that was never modified in the merge source?

TL;DR : From a purely theoretical perspective, is it possible for Git to report conflicts on a file during the merging (not rebasing) of a branch into master if that file has never been modified at all on the branch (which was created directly from…
SantiBailors
  • 1,596
  • 3
  • 21
  • 44
0
votes
2 answers

IntelliJ Idea VCS shows three files

Hi when I click on Intellij Idea's VCS code it shows me diff between three files - one with SHA1 hash , other the base version and third the server version. Please explain what do they refer too.I want to keep other users' changes and merge my…
user1858851
  • 127
  • 1
  • 1
  • 12
0
votes
0 answers

Merge Request Contains Merge Conflicts

I made a merge request to merge my current branch with the master branch but the branches seem to be unable to merge giving me the following notification. When I click the "Merge locally" button I'm given a series of commands I'm meant to execute…
BlueBarren
  • 321
  • 7
  • 24
0
votes
0 answers

My form resolution revert back to my laptop native resolution

I created some forms but when I debugged them, it come out with different resolution forms. Whenever I click Enter button, it will revert back to my laptop original resolution. My laptop screen is 1920 x 1080 and the form resolution is 1366 x 768.…
kappa4head
  • 1
0
votes
1 answer

git merge appear conflict,how to solve?

My project have a master and a branch named develop. I write some code in a java file named A in develop, than i switch to the master . when I merge the develop branch, i get the latest code of develop branch to master. Until now,no errors. But…
yinglian qin
  • 11
  • 1
0
votes
0 answers

BitBucket - "Conflicts must be resolved before you merge", but I have no conflicts

I'm attempting to merge from master into a branch. I initially had some conflicts which I have now resolved. However, Bitbucket is still preventing me from merging, but shows no conflicts anymore. I tried deleting the pull request and creating a…
John Pasquet
  • 1,824
  • 15
  • 20
0
votes
0 answers

How to avoid Insert and Update conflict in SQL Server Merge Replication?

I have developed a web application using Asp.net Rest Api, Entity Framework code-first approach. I have publisher with 20-30 subscribers. All my subscribers may work online or offline. After setting up merge replication, I have faced insert and…
angfreak
  • 993
  • 2
  • 11
  • 27
0
votes
0 answers

about Code merge and SVN (4 developers 1 mutual server) ---Source code management issue non technical

I am now working in a team of 4 (Dev team). We all develop features and fix defects on our local environment. We are using SVN for code management. A common issue is that: Developer A's source code works on his local machine (Version 1.5) Developer…
Terrance
  • 1
0
votes
1 answer

Git - pulling from master remote shows unstaged/changed files - how to determine source

This post involves several questions, as I'm not sure what's going on and need to as well know how to determine source of problem. The repo is stored at Git Hub and I have access to it. When I do an initial git clone everything works fine and I see…
Oliver Williams
  • 5,966
  • 7
  • 36
  • 78
0
votes
1 answer

Why does path-restricted 'git log' omit merge commits with interesting conflict resolutions?

If a file's history includes a merge commit with an "interesting" conflict resolution, git log will skip over it. Why is this, and how can I make that commit be included? (By "interesting", I mean a resolution that doesn't just take the version…
Matt McHenry
  • 20,009
  • 8
  • 65
  • 64
0
votes
1 answer

Reducing conflicts on stored procedure that changes a lot

I have a stored procedure called "populateProcessTypes" that looks something like this Insert Into ProcessTypes(processTypeId, processCode, processName) Select processTypeId, processCode, processName From ( Select 1 processTypeId, 'L_EMP'…
user3042151
  • 113
  • 1
  • 10
0
votes
4 answers

Merge conflict - Git rebase master which is master

So I am still newish with git and have just discovered the rebase option to update a branch with master. I ran: git checkout mybranch git rebase master Now I have a few merge conflicts. Is this the same as fixing normal merge conflicts? I want to…
luckyging3r
  • 3,047
  • 3
  • 18
  • 37
0
votes
1 answer

Determine if binary file changed while resolving "both added" git conflict

I'm performing a rebase, and encounter "both added" conflicts for binary files. I want to accept 'ours' if the binary files are the same, 'theirs' if they are changed. During the resolve, how can I test if the binary files are same or different?
MarkE
  • 204
  • 2
  • 9
0
votes
1 answer

Git files needs merge, but not present

I am tryinng to merge update from a master code on another person's github page, and I have almost everything fixed. Now when I type git checkout master I get this in response: $ git checkout master >…
BarrowWight
  • 181
  • 2
  • 12
0
votes
0 answers

How to identify problematic files with git merge in Visual Studio 2015?

I am using Visual Studio 2015 Update 3 with Git version control hosted by Visual Studio Team Services (VSTS). We follow the Git Workflow model, although I don't think that is actually relevant to the problem I am having. I had a total of 74 changes…
prlcutting
  • 379
  • 2
  • 12
1 2 3
…
50 51