conflict

57 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
function naming conflicts
user_6224950
•
6
2
446
data.table lubridate r conflict naming
Git says a file is unmerged and I can't commit, but the file seems to be merged
user_1382650
•
47
5
94559
conflict merge git
How can I tell how far into a git rebase I am when resolving conflicts?
user_261970
•
10
4
1213
rebase conflict git
what causes submodule conflicts in git, and how should they be resolved?
user_5616380
•
13
3
15998
git-submodules conflict merge git
Import patches with conflicting changes for mercurial repository with tortoiseHg
user_5902780
•
9
2
5367
tortoisehg import patch conflict mercurial
Subversion post-merge tree conflict - "local delete, incoming edit upon merge"
user_2771280
•
30
4
39238
conflict merge svn
How to use git difftool to diff merge conflicts?
user_2596920
•
40
2
33358
config diff conflict merge git
Is it possible to always (force) overwrite local changes when updating from SVN? Ignore conflicts?
user_939660
•
68
5
89870
conflict svn command-line
Have git rerere automatically mark files as resolved?
user_145690
•
18
1
2100
git-rerere conflict merge git
Can I run two web servers on the same computer?
user_2455490
•
25
7
54464
webserver conflict apache python
Hot Questions