Alex Rivera | Logout

Questions tagged merge-conflict-resolution

6 questions

Sort by: Newest Votes Active
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
12
votes
2
answers

How resolve this Mercurial conflict?

mercurial merge merge-conflict-resolution kdiff3
asked 2012-01-25T13:35:13.930
28
votes
2
answers

git: How to get "ours, theirs, original" for merge conflicts?

git merge-conflict-resolution diff3
asked 2012-01-12T08:46:08.590
50
votes
4
answers

Jump to next error / code highlighted in red

vim syntax keyboard-shortcuts merge-conflict-resolution
asked 2011-06-15T17:27:38.160
370
votes
9
answers

INSERT IF NOT EXISTS ELSE UPDATE?

sqlite insert exists upsert merge-conflict-resolution
asked 2010-09-03T10:47:14.647
215
votes
5
answers

git rebase, keeping track of 'local' and 'remote'

git rebase merge-conflict-resolution
asked 2010-06-16T07:43:04.047