chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c08c7b) | patch
Patch to clarify the "unsolved conflicts" message in Stacked Git
authorJason Green <jason@transgaming.com>
Thu, 18 Dec 2008 14:29:11 +0000 (09:29 -0500)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 2 Jan 2009 08:54:17 +0000 (08:54 +0000)
commite4f6fdcb38127754b8f0b31d202354db85553aff
tree3b19b1cbd03e3f9bee5bedc32ba54600ac82d3a1tree | snapshot
parent3c08c7b9b07077b9f0dc6a8bd963e571007f3dafcommit | diff
Patch to clarify the "unsolved conflicts" message in Stacked Git

I recently started using Stacked Git to manage my patchsets, and it's
been a great tool.  However, I was a bit confused for a while on how
to resolve conflicts when a merge fails.  Here's a patch to hopefully
clarify that message a little.

Signed-off-by: Jason Green <jason@transgaming.com>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/commands/common.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)