Hi, On Sun, 21 Oct 2007, Scott Parish wrote: > How is the intended way to deal with "git stash apply" conflicts? > If i just edit the file and remove the conflict, "git diff" gives > some really messed up output. Documentation for other commands and > conflicts suggest "git commit" after cleaning up the conflict, or > "git add", but in the case of "stash apply" i'm not ready for a > commit yet, and "git add" keeps "git diff" from showing any output. You are probably seeing combined diffs. This show not only the differences of the working tree relative to HEAD, but also of the changes stored in the stash. You should have a look into Documentation/diff-format.txt (section "combined diff format") to learn more. Hth, Dscho - 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
