jem notesversion 2 / featuring this entry or see all/search

apps7 c3 design16 git17 javascript1 jquery1 mac17 math‑ish3 matlab2 mercurial1 python13 rails13 random18 ruby38 tex7 todo4 tools22 use‑this‑cmd22 use‑this‑code8 vim16 writings2

Mar 27

resolve merge problems with git git

Here are some ways of resolving a conflicted merge in git.

git checkout --theirs filename
# or
git checkout --ours filename
# or, for an interactive interface
git mergetool