| commit | e4f6fdcb38127754b8f0b31d202354db85553aff | |
| author | Jason Green <jason@transgaming.com> | |
| Thu, 18 Dec 2008 14:29:11 +0000 (18 09:29 -0500) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Fri, 2 Jan 2009 08:54:17 +0000 (2 08:54 +0000) | ||
| tree | 3b19b1cbd03e3f9bee5bedc32ba54600ac82d3a1 | treesnapshot (tar.gz zip) |
| parent | 3c08c7b9b07077b9f0dc6a8bd963e571007f3daf | commitdiff |
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>
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 | diffblobblamehistory |