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
2 answers

What does this merge conflict mean and how to resolve it?

I am using git. And restore stashed changes but get CONFLICT $ gn # On branch feature/improve_list # Changes to be committed: # (use "git reset HEAD ..." to unstage) # #1 modified: ../lib/Devel/DebugHooks.pm # # Unmerged paths: # (use…
Eugen Konkov
  • 22,193
  • 17
  • 108
  • 158
0
votes
1 answer

How can I see diffs of all of the conflicts in a mercurial (or git) merge?

This question asks how to see which files have conflicts in a merge. I'd also like to be able to quickly see listings of the diffs for all of the conflicts (as opposed to the diffs in the merge that went through cleanly.) For instance, this would…
Joshua Goldberg
  • 5,059
  • 2
  • 34
  • 39
0
votes
2 answers

resolve merge conflicts without manually editing each file

I'm new to Git and I'm trying to find a quicker way to resolve merge conflicts. Say I tried to merge a branch to master and I get merge conflicts for some of the files. Changes to be committed: modified: ... Unmerged paths: (use "git add…
mysticalstick
  • 155
  • 6
  • 21
0
votes
2 answers

TFS 2013 raise conflict for every change

I am trying to Merge a change set to parent branch, lately almost every change I make in the files is getting a conflict. In the image below you can see that I have made only a small change and it get consider as a conflict. How can I change it so…
Offir
  • 3,252
  • 3
  • 41
  • 73
0
votes
2 answers

Bit bucket 'This pull request has conflicts' but git locally states 'up-to-date'

I'm having a pretty strange issue with bit bucket when I add a service reference to a project. In summary, when creating a pull request after adding the service reference, I get a warning, highlighting This pull request has conflicts.. So I head to…
Lloyd Powell
  • 18,270
  • 17
  • 87
  • 123
0
votes
1 answer

I cannot see the conflicts that github is alerting me of

When revising a pull request (it is: https://github.com/iluaepidi/widget/pull/8 but I don't know if that data is important) I read this message on github: This branch has conflicts that must be resolved use the command line to resolve conflicts…
malarres
  • 2,941
  • 1
  • 21
  • 35
0
votes
0 answers

GIT - Way to track file changes in your team and warn about potential conflicts

I am looking for a way/tool to to get notified if someone else on my team is editing the same file as I am. This is in order to prevent conflicts when merging later. It's not about locking the file, but only about turning your attention to it (and…
Stan
  • 2,151
  • 1
  • 25
  • 33
0
votes
3 answers

Would resolving Git merge conflicts always mean adjusting your files to match those that you're merging from?

I'm learning Git from here and don't see how resolving conflicts can be anything other than changing your files to match that of the files you're merging from. This is because you can't change the files that you're merging from so you'd have to…
akantoword
  • 2,824
  • 8
  • 26
  • 43
0
votes
1 answer

How to get svn update (e) to show merge conflicts in diff3 form?

If I run svn update, and hit a merge conflict I get an (e) edit option. However, that edit session appears to only provide 2-way diffs, not the diff3 format I would have expected. Example: <<<<<<< .mine LGSYSTEMLOGBLOCK *pSLb; // DMLOGREC …
Peeter Joot
  • 7,848
  • 7
  • 48
  • 82
0
votes
1 answer

How to restore changes from commit in git?

I know there are tons of questions like this, but none solution worked out for me. Here is what happened: I tried to add a new feature in my app, so I created a new branch to implement this feature. After I was done I merged it to master, deleted…
Henrique Dourado
  • 320
  • 1
  • 7
  • 16
0
votes
1 answer

Automatic conflict resolution on certain files (subversion)

I have a situation where makefiles are getting automatically updated as part of the build process, but still they are under subversion version control. (Yes I know you it's questionable put automatically created files under revision control, but…
skyking
  • 13,817
  • 1
  • 35
  • 57
0
votes
1 answer

Editing git commit in nonconflicting way from long ago results in conflicts

We have some data that was accidentally stored in one of our configuration files and stuck in there unnoticed for about a month. It's a private repo with very limited user access, so we would like to rewrite history and pull that data out before…
Paul LaMotte
  • 31
  • 4
0
votes
1 answer

Resolved issue between no commited same local system and git file

In one of git scenario, I have same not commit file on local system which is available on git Server as well. Now situation is, I haven't add these local system file and after stashing when I'm trying to pull master it prompt error to delete these…
CoDe
  • 11,056
  • 14
  • 90
  • 197
0
votes
1 answer

TFS: Enforce checkout of latest version for non-mergeable files

We have some files with binary content in our TFS repository. To avoid conflicts we already disabled the option "Enable file merging and multiple checkout" for those file types. But we still run into problems when someone checks out an older than…
Martin
  • 1
0
votes
1 answer

How to merge branch into trunk in Eclipse 4.4.2

Trying to merge branch back into the trunk but every time I do it doesn't seem to detect any changes. Please help
AngelaTastic
  • 1
  • 3
1 2 3
…
50 51