OGMS / ogms

Automatically exported from code.google.com/p/ogms
Creative Commons Attribution 4.0 International
21 stars 17 forks source link

Github diff not helpful for collaborative work #100

Open alanruttenberg opened 8 years ago

alanruttenberg commented 8 years ago

RDF/XML diffs aren't stable or informative in many cases.

Alternatives:

1) Try Functional Syntax saving instead 2) Use a hook, e.g.

Git hook: post-merge This hook is invoked by git merge, which happens when a git pull is done on a local repository. The hook takes a single parameter, a status flag specifying whether or not the merge being done was a squash merge. This hook cannot affect the outcome of git merge and is not executed, if the merge failed due to conflicts.

This hook can be used in conjunction with a corresponding pre-commit hook to save and restore any form of metadata associated with the working tree (e.g.: permissions/ownership, ACLS, etc). See contrib/hooks/setgitperms.perl for an example of how to do this.

Perhaps write a post-merge hook that runs http://www.ebi.ac.uk/efo/bubastis/ or similar and commits an additional file(say, ogms.owl.diff) with the diffs it computes

cmungall commented 8 years ago

https://github.com/ShahimEssaid/git-owl-tools/wiki

cc @ShahimEssaid