From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8500 invoked by alias); 25 Jul 2013 18:54:35 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 31578 Received: (qmail 1352 invoked from network); 25 Jul 2013 18:54:19 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at closedmail.com does not designate permitted sender hosts) From: Bart Schaefer Message-id: <130725115343.ZM1636@torch.brasslantern.com> Date: Thu, 25 Jul 2013 11:53:43 -0700 In-reply-to: Comments: In reply to Richard Hartmann "Re: git branches and compilation" (Jul 24, 4:25pm) References: <130615124610.ZM12323@torch.brasslantern.com> X-Mailer: OpenZMail Classic (0.9.2 24April2005) To: zsh workers Subject: Re: git branches and compilation MIME-version: 1.0 Content-type: text/plain; charset=us-ascii On Jul 24, 4:25pm, Richard Hartmann wrote: } } As a word of warning, metastore's binary storage format is _not_ merge } friendly. You must not diverge or branch off this file. The .metadata files are not part of the git repository, they're listed in .gitignore. Instead there is a separate subdirectory of metadata for each git branch, which is maintained by the pre-commit and post-checkout hooks. As I mentioned, this is probably helpful only because I keep separate build and source trees. Thanks for the pointer to metamonger, though; I will look at it.