~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ce0a1f8) | patch
Tutorial: Talk about conflicts when introducing StGit
authorKarl Hasselström <kha@treskal.com>
Sun, 12 Oct 2008 15:03:51 +0000 (17:03 +0200)
committerKarl Hasselström <kha@treskal.com>
Sun, 12 Oct 2008 15:03:51 +0000 (17:03 +0200)
commit808d80f8b0b7a53ff3dcfab50e863e473678cd79
treed0b4f2125ecbc1d6efee5623a759b1a4d10cb5fdtree | snapshot (tar.gz zip)
parentce0a1f86b26e40dbe788b53b97482c5fb1010870commit | diff
Tutorial: Talk about conflicts when introducing StGit

Conflicts and conflict resolving are essential features of StGit, so
we'd better tell the user about them.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Documentation/stg.txt diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)