KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Questions tagged
conflict
18 questions
Follow Tag
Sort by:
Newest
Votes
Active
43
votes
3
answers
How to automatically resolve a Git conflict by taking the version in the current branch?
git
merge
automation
conflict
asked 2013-01-06T12:46:45.493
30
votes
8
answers
What is the difference between "conflict serializable" and "conflict equivalent"?
database
conflict
serializable
equivalence
asked 2012-12-11T15:27:51.197
13
votes
2
answers
Git: currently in merge/conflict with private remote repo. How to tell Git to just use my local files?
git
merge
conflict
merge-conflict-resolution
asked 2012-09-28T02:08:54.577
55
votes
6
answers
TortoiseSVN reports conflict, but no conflict can be found
svn
version-control
tortoisesvn
conflict
working-directory
asked 2012-05-02T13:31:07.603
14
votes
1
answers
A django model that subclasses an abc, gives a metaclass conflict
python
django
conflict
metaclass
abc
asked 2012-01-04T07:52:59.380
15
votes
2
answers
How to fix issue when committing a change to CVS
cvs
commit
conflict
asked 2011-09-08T08:05:43.210
54
votes
5
answers
Trouble merging upstream changes back into my branch
git
merge
commit
conflict
partial
asked 2011-04-24T20:00:27.747
9
votes
1
answers
Why does running multiple Wicket applications cause AJAX conflicts?
ajax
wicket
conflict
asked 2011-04-11T09:36:00.873
81
votes
4
answers
R: 2 functions with the same name in 2 different packages
function
r
package
conflict
asked 2011-04-06T10:01:08.850
71
votes
5
answers
Is it possible to always (force) overwrite local changes when updating from SVN? Ignore conflicts?
svn
command-line
conflict
asked 2010-09-14T13:14:45.670
11
votes
7
answers
<string.h> conflicting with my own String.h
c++
string
xcode
header
conflict
asked 2010-06-26T18:43:28.700
12
votes
4
answers
Problems with noobs putting my GA code into their sites
javascript
google-analytics
conflict
spoken-language
asked 2010-05-17T14:37:26.323
27
votes
7
answers
Can I run two web servers on the same computer?
python
apache
webserver
conflict
asked 2010-02-23T16:10:40.153
404
votes
14
answers
Android: View.setID(int id) programmatically - how to avoid ID conflicts?
android
android-view
conflict
asked 2009-11-11T10:23:11.880
15
votes
1
answers
How to avoid conflict between JQuery and Prototype
javascript
jquery
prototypejs
conflict
asked 2009-09-09T18:40:27.807
139
votes
13
answers
What should I do if two libraries provide a function with the same name generating a conflict?
c
conflict
name-collision
asked 2009-03-24T16:47:28.417
31
votes
4
answers
How can KDiff3 be used properly with TortoiseSVN to resolve conflicts?
svn
tortoisesvn
diff
conflict
asked 2008-10-10T17:56:32.383
54
votes
2
answers
How to resolve a conflict with git-svn?
git
svn
merge
conflict
asked 2008-09-22T02:03:55.593