From 1c0322a38644bfdf46bf5f3752939234798d1f4f Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Tue, 22 May 2012 15:18:47 +0100 Subject: branch+merge: add why we petrify to walkthrough --- doc/branching-merging-systems.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') 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. -- cgit v1.2.1