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
69
votes
5 answers

Is it possible to always (force) overwrite local changes when updating from SVN? Ignore conflicts?

I know I should be working on a branch of my own but a couple of us are on the same branch of a project. One of the Dev's made a commit and I just wanted to update my local copy with the latest from SVN. Running 'svn update' I get this…
Phill Pafford
  • 83,471
  • 91
  • 263
  • 383
68
votes
8 answers

"Conflicts prevent checkout" error using Git in Visual Studio

I am using Git in Visual Studio. When I am trying to synchronize, the following message appears: An error occured. Detailed message: An error was raised by libgit2. Cetegory = checkout(MergeConflict). 1 conflicts prevent checkout I don't have a…
Jim Blum
  • 2,656
  • 5
  • 28
  • 37
60
votes
3 answers

Merging but overwriting changes in Git

When I merge a branch in Git to master I often get merge conflicts. Is there a way to merge a branch and just overwrite the stuff in the current branch?
John Hunt
  • 4,265
  • 8
  • 45
  • 59
56
votes
5 answers

How do I resolve a conflict after git pull?

I have to solve some conflict after a git pull. $ git pull CONFLICT (rename/add): Renamed vignette_generator_mashed.h->vision_problem_8.h in 49423dd0d47abe6d839a783b5517bdfd200a202f. vision_problem_8.h added in HEAD Added as…
Tim
  • 1
  • 141
  • 372
  • 590
54
votes
5 answers

Trouble merging upstream changes back into my branch

I'm running into conflicts while trying to merge upstream changes back into my branch and I'm not sure how to resolve them. I created my own fork. I cloned it. I made changes to the branch on my fork, committed, and pushed. But then the main fork…
anonymous
  • 551
  • 1
  • 4
  • 5
54
votes
2 answers

How to resolve a conflict with git-svn?

What is the best way to resolve a conflict when doing a git svn rebase, and the git branch you are on becomes "(no-branch)"?
csexton
  • 24,061
  • 15
  • 54
  • 57
54
votes
6 answers

TortoiseSVN reports conflict, but no conflict can be found

I have a working copy for my entire repository, which contains multiple Python projects. When I choose right-click --> SVN Update in Windows File Explorer I am getting an error message listing a particular project folder: Command: Update Updating:…
Brian
  • 2,702
  • 5
  • 37
  • 71
51
votes
4 answers

Vscode merge conflict with yellow square

somehow my vscode changed, when i want to resolve merge conflict,there is something like <<<
Creabine
  • 829
  • 4
  • 7
50
votes
5 answers

Extension methods conflict

Lets say I have 2 extension methods to string, in 2 different namespaces: namespace test1 { public static class MyExtensions { public static int TestMethod(this String str) { return 1; } }…
Yochai Timmer
  • 48,127
  • 24
  • 147
  • 185
50
votes
3 answers

How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?

When you resolve a conflict, then stage the changes, then do a git diff, it shows you two columns of +'s and -'s, one for "ours" and one for "theirs". Given a merge commit in a repo's git history, how do I see that resolution, which was done by…
Pistos
  • 23,070
  • 14
  • 64
  • 77
49
votes
1 answer

How to solve two packages requirements conflicts when running composer install?

I want to install these two packages: "anahkiasen/former": "dev-master" "vespakoen/menu": "dev-master" But composer says that each of them depends on diferent versions of this package: "anahkiasen/html-object":…
cawecoy
  • 2,359
  • 4
  • 27
  • 36
48
votes
10 answers

Eclipse EGit Checkout conflict with files: - EGit doesn't want to continue

I've started Eclipse EGit. In some scenarios it is really not comprehensive. I have local file e.g. pom.xml changed. On git server this file was changed. I do pull, EGIt says: Checkout conflict with files: i.e. pulling stops (fetch is done, but…
Paul Verest
  • 60,022
  • 51
  • 208
  • 332
47
votes
5 answers

Git says a file is unmerged and I can't commit, but the file seems to be merged

I had about 12 file conflicts when I merged branches. I manually fixed all the conflicts and staged the files. But now when I try to commit, it says one of the files is unmerged. U app/models/disclosure_event.rb fatal: 'commit' is not possible…
Adam Albrecht
  • 6,680
  • 4
  • 31
  • 35
45
votes
4 answers

Conflicting library version in a Java Maven project

When building a Maven project that has many dependencies, some of those dependencies depend on the same library but use a different version which is causing errors when running an application. For example, if I add two different project…
John Papastergiou
  • 999
  • 2
  • 14
  • 29
43
votes
1 answer

Does an amazon cloudfront distribution with multiple origins conflict?

i have 2 different images in 2 websites at: http://www.siteA.com/avatar.png http://www.siteB.com/avatar.png If i create an Amazon Cloudfront distribution with 2 origins: www.siteA.com and www.siteB.com and then i call for…
Rakib
  • 12,376
  • 16
  • 77
  • 113
1
2
3
…
99 100