On 2008-11-04 08:37:24 -0500, Jon Smirl wrote: > I hit a case when refreshing a buried patch that needed a merge > conflict sorted out. I'm unable to recover out of the state. Hmm, so what you're saying is basically that you did something with "stg refresh -p" that caused a merge conflict, and that messed things up so that you needed to run "stg repair". Is that right? Have you been able to reproduce it? (I would like to add the failing case to the test suite.) -- Karl Hasselström, kha@xxxxxxxxxxx www.treskal.com/kalle -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html