Managing Git workflows in large repos about metastore HOT 1 CLOSED

metastore is only a tool for storing or applying metadata.
In examples/ directory you can find some scripts helping to some extent using it in scenarios you describe. Check their descriptions:

• git-metapull:
  

  metastore/examples/git-metapull

  Lines 3 to 7 in 78dd3ed

  	# This script can be used instead of git pull when updating from
  	# a remote repo to make sure the metadata matches what is stored in
  	# the repo.
  	# It will do a git pull, show a list of changes to be made to
  	# the metadata, and after getting confirmation, apply the changes.

• git hook: post-checkout
  

  metastore/examples/hooks/post-checkout

  Lines 3 to 4 in d119c8d

  	# An example hook script to set metadata information using
  	# metastore after each checkout.

• git hook: pre-commit
  

  metastore/examples/hooks/pre-commit

  Lines 3 to 15 in 95921e7

  	# An example hook script to store metadata information using
  	# metastore on each commit.
  	#
  	# WARNING:
  	#
  	# If the commit is aborted (e.g. by not entering any synopsis),
  	# then updated metastore file (.metadata by default) is not reverted,
  	# so its new version remains in the index.
  	# To undo any changes in metastore file written since HEAD commit,
  	# you may want to reset and checkout HEAD version of the file:
  	#
  	# git reset HEAD -- .metadata
  	# git checkout HEAD -- .metadata

There is no metastore documentation regarding this topic beside above mentioned comments in scripts and one paragraph in README file:

There is issue #33 for tracking that. Patches are welcomed.

But, I wrote "to some extent", because collisions are effectively merge conflicts (or local forms of them, i.e. how users should integrate their changes with regards to metadata), which need manual intervention/decision, especially if you want some particular behavior.
How to handle merge conflicts is up to the user. Dump action has been introduced in metastore to help investigate stuff (you can dump state stored in .metadata or in file system for given path).

What we also lack is proper textual format (#6) that would help in such cases, because then you could resolve conflicts using your favorite tools (meld, kdiff3, you name it). Binary formats are not really handy for that.

from metastore.