summaryrefslogtreecommitdiff
path: root/doc/branching-merging-systems.mdwn
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-05-22 15:18:47 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2012-05-22 15:18:47 +0100
commit1c0322a38644bfdf46bf5f3752939234798d1f4f (patch)
tree2b8fc0b573eddc5520218c4190a93621ca42c41d /doc/branching-merging-systems.mdwn
parentc2282fb5e00218c4a92b9bcba41d58e9b212fedd (diff)
downloadmorph-1c0322a38644bfdf46bf5f3752939234798d1f4f.tar.gz
branch+merge: add why we petrify to walkthrough
Diffstat (limited to 'doc/branching-merging-systems.mdwn')
-rw-r--r--doc/branching-merging-systems.mdwn4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/branching-merging-systems.mdwn b/doc/branching-merging-systems.mdwn
index c7764333..3daee73b 100644
--- a/doc/branching-merging-systems.mdwn
+++ b/doc/branching-merging-systems.mdwn
@@ -138,6 +138,10 @@ instead of branch names or whatever. The changes need to be committed
to git manually, so that the user has a chance to give a good commit
message.
+Petrification is useful to prevent the set of changes including changes
+by other team members. When a chunk is edited it will be made to refer
+to that ref instead of the SHA-1 that it is petrified to.
+
Petrification can be done by resolving the chunk references against
the current state of the git repositories, or it can be done by getting
the SHA-1s directly from a system image, or a data file.