diff options
| author | Catalin Marinas <catalin.marinas@gmail.com> | 2009-12-03 22:35:28 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@gmail.com> | 2009-12-03 22:35:28 +0000 |
| commit | b57654e6e7ffd90785f6f689786f9564f6f48eb6 (patch) | |
| tree | 0cba78ed8b721f1732cc36b0c252bbbd3c4ffa17 | |
| parent | bbd0c1f47a633740ce467e11113c1edf5df52829 (diff) | |
| parent | 814d59e31b173fe687d26f073a8cc57fd4485c84 (diff) | |
| download | stgit-b57654e6e7ffd90785f6f689786f9564f6f48eb6.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | Documentation/tutorial.txt | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 7484d70..8af50ef 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -258,9 +258,6 @@ top of +second+, now that they both modify +TODO+. We can take a look at the situation with linkstg:status[]: $ stg status - ? TODO.ancestor - ? TODO.current - ? TODO.patched C TODO As we were told by linkstg:push[], the conflict is in the file +TODO+. @@ -268,19 +265,14 @@ As we were told by linkstg:push[], the conflict is in the file +TODO+. listed here; prefixed with +C+ if they had conflicts, and +M+ if StGit managed to automatically resolve everything in the file.) -NOTE: +TODO.ancestor+, +TODO.current+, and +TODO.patched+ are the -three versions of the file that StGit tried to merge. The +.current+ -file is the version before the patch was applied, +.patched+ is the -version in the patch we tried to push, and +.ancestor+ the version -that contains neither of the added lines. - At this point, we have two options: 1. Undo the failed merge with linkstg:undo[]. (Remember to use the +$$--hard$$+ flag, since the unresolved conflict means the worktree is not clean.) - 2. Manually resolve the conflict. + 2. Manually resolve the conflict (editing the file directly followed + by +git add+ or using +git mergetool+.) To resolve the conflict, open +TODO+ in your favorite editor. It ends like this: |