Stack Overflow
Stack Overflow

Questions tagged [conflict]

DO NOT USE THIS TAG. Instead try to use something more specific like name-collision, failed-installation, merge-conflict-resolution, conflicting-libraries etc (see also the meta discussion: https://meta.stackoverflow.com/questions/284369/end-the-conflict)

DO NOT USE THIS TAG. See the meta discussion

1652 questions
41
votes
2 answers

How to use git difftool to diff merge conflicts?

After a merge failed with some conflicts I can list those with git diff, but git difftool won't display them with the difftool set in the config(in my case Kaleidoscope), instead it will just use normal diff. A git difftool comparing with a previous…
j-pb
  • 822
  • 2
  • 8
  • 12
41
votes
3 answers

Why after merge does GIT say "Already up-to-date", but differences between branches still exist?

I was originally working in 'newfeature' branch and I was called to fix a bug on the live branch urgently. I created a branch for that called 'generalmaintenance', did the job and then switched to develop and merged it in. I now want to return to…
Peter White
  • 1,016
  • 2
  • 14
  • 29
38
votes
1 answer

Gradle: how to display where a dependency conflict arises

I have a Gradle project with many dependencies, one of which is resolved as follows: gradle dependencyInsight --configuration compile --dependency javax.activation :dependencyInsight javax.activation:activation:1.1 (conflict resolution) +---…
Giovanni Botta
  • 9,626
  • 5
  • 51
  • 94
36
votes
3 answers

How to resolve merging conflicts in Mercurial (v1.0.2)?

I have a merging conflict, using Mercurial 1.0.2: merging test.h warning: conflicts during merge. merging test.h failed! 6 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge…
lajos
  • 25,525
  • 19
  • 65
  • 75
35
votes
3 answers

How to automatically resolve a Git conflict by taking the version in the current branch?

Let's suppose that I get a merge conflict on foo/bar.txt when running this: $ git checkout A $ git merge B I'd like to automatically resolve the conflict by taking foo/bar.txt from branch A. (I know what I'm doing, and I do need this. The version…
pts
  • 80,836
  • 20
  • 110
  • 183
34
votes
4 answers

PEP8: conflict between W292 and W391

As far as I know in unix it's a good practice to always have blank line at the end of file - or to put it in other words: every line should end with \n. While checking my python code with PEP8 I noticed that it also states that there should be \n at…
seler
  • 8,803
  • 4
  • 41
  • 54
31
votes
2 answers

How do you stop UITapGestureRecognizer from catching EVERY tap?

Hello I have an opengl view and on that I have a tab bar. I'm using a tap recognizer to tap different 3d objects on screen. In the tab bar I have a button but it doesn't work because the tap recognizer catches these taps too. How do I stop this?…
gyozo kudor
  • 6,284
  • 10
  • 53
  • 80
31
votes
1 answer

Conflict on bitbucket remote server but everything is up to date locally

I'm working on a project, so I pushed a feature branch to the remote repository(using Atlassian bitbucket) and opened a pull request. But on one file, the bitbucket diplay a "MOVED" status, in brown and shows a conflict message : conflict: modified…
NI6
  • 2,477
  • 5
  • 17
  • 28
30
votes
1 answer

Git conflict "both deleted"

I don't understand why "both deleted" is a status for unmerged paths. If: OldStandard is the base NewStandard is the last commit on the trunk OldCustom is the branch (fork from OldStandard) we try to merge back in master Why is there a conflict…
user3341592
  • 1,419
  • 1
  • 17
  • 36
30
votes
4 answers

Subversion post-merge tree conflict - "local delete, incoming edit upon merge"

I did a merge between the trunk and a branch. On the trunk, there is a folder, let's say templates/Toto. On the branch, everything but the folder Toto is there (not a local delete, Toto is simply not in the repo). After I performed the merge (I…
fbiville
  • 8,407
  • 7
  • 51
  • 79
30
votes
4 answers

How can KDiff3 be used properly with TortoiseSVN to resolve conflicts?

I have TortoiseSVN set up to use KDiff3 as the conflict resolution tool (I find it shows more information useful to the merge than the built-in TortoiseMerge does). When I open a file with Tortoise's "Edit Conflicts" command it shows me the three…
Owen
  • 7,494
  • 10
  • 42
  • 52
29
votes
3 answers

Conflicts in Gemfile.lock while rebasing

What strategies do people have for resolving Gemfile.lock conflicts while rebasing in Git? I am having to do this a lot in a recent project, and not only is it tedious, it's not always clear how to do the merge.
dangerousdave
  • 6,331
  • 8
  • 45
  • 62
29
votes
8 answers

What is the difference between "conflict serializable" and "conflict equivalent"?

In database theory, what is the difference between "conflict serializable" and "conflict equivalent"? My textbook has a section on conflict serializable but glosses over conflict equivalence. These are probably both concepts I am familiar with, but…
taz
  • 1,506
  • 3
  • 15
  • 26
27
votes
2 answers

git: How to get "ours, theirs, original" for merge conflicts?

Git merge conflicts are shown like this usually: <<<<<<< HEAD:file.txt Code changed by A ======= Code changed by B >>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt However, I know it is possible (with some git config option) to to also…
Jan Rüegg
  • 9,587
  • 8
  • 63
  • 105
27
votes
13 answers

How do I implement JQuery.noConflict() ?

I am using both javascript and jquery code on the same html page. For some reason, the jQuery library is stopping my native javascript code from working properly. I found this page: jQuery No Conflict that says you can use a jquery.noConflict to…
SuperLuigi
  • 299
  • 1
  • 4
  • 8
1 2
3
…
99 100