Popular "conflict" questions | Page 8

We have some company middleware and sometimes its difficult to find the correct version Im looking for so I often …

svn conflict resolve svn-checkout

I pulled from origin to update my local, and one file had conflicting changes. I resolved the conflict, but I …

git add commit conflict stage

I have a problem with Android libraries. I would like use the method Hex.encodeHexString(Byte Array) from the library …

android apache conflict nosuchmethoderror apache-commons-codec

Lets say I have 2 extension methods to string, in 2 different namespaces: namespace test1 { public static class MyExtensions { public static int …

c# methods namespaces extension-methods conflict

Setup: 3 git repos - on github, local and on staging server. I develop locally, push it to github and staging …

git diff compare conflict status

I want to resolve some conflicts of an SVN file using Meld. I'm using the Head version and my version …

merge resolve conflict meld

Trying to use/learn git with a personal project. There's only me and a remote git repo, a few commits, …

git merge conflict merge-conflict-resolution

What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution? In Preferences > Team > …

eclipse svn diff conflict beyondcompare

I'm having a problem understanding the shift/reduce confict for a grammar that I know has no ambiguity. The case …

grammar conflict gppg

This is the output from java -version: java version "1.7.0_25" Java(TM) SE Runtime Environment (build 1.7.0_25-b15) Java HotSpot(TM) 64-Bit …

java macos maven conflict

Top "Conflict" questions