Site logo
Stories around the Genode Operating System RSS feed
Emery Hemingway avatar

Restoring git merge functionality

To restore basic git functionality such as git diff and git merge the depot hash artifacts must be treated as binary files by git. The hash files are in fact mostly binary, they contain a date and sha256 digest. Hash files should not be hand-edited and are produced as a side effect of the depot build system.

Add the following to $HOME/.config/git/attributes.

 hash binary merge=genode-hash

And the following to $HOME/.gitconfig

 [merge "genode-hash"]
   name = discard hash artifacts
   driver = cp %B %A
   recursive = binary

This merge stategy simply takes the content of the hash files from the branch being merged into the current branch.