conflict

57 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
How can I discard remote changes and mark a file as "resolved"?
user_12848230
•
209
2
113193
git-merge-conflict conflict merge git
How to merge conflicts (file project.pbxproj) in Xcode use svn?
user_2380280
•
79
13
100024
xcode conflict svn iphone
Android: View.setID(int id) programmatically - how to avoid ID conflicts?
user_1843670
•
384
15
284276
android-view conflict android
How do I resolve a conflict after git pull?
user_1564580
•
56
5
102745
git-merge git-pull conflict git
How do I manage conflicts with git submodules?
user_1018190
•
173
9
160916
git-submodules conflict branch git
What should I do if two libraries provide a function with the same name generating a conflict?
qeek_821100
•
121
13
58397
name-collision conflict c
How to resolve a conflict with git-svn?
fuzzymonk_198390
•
54
2
19903
conflict merge svn git
Hot Questions