Skip to content

Instantly share code, notes, and snippets.

@nawroth

nawroth/merge.adoc

Last active Aug 29, 2015
Embed
What would you like to do?

Failed merge

Here’s a failed merge that would just render as normal text:

Source:

|==========================================
| hpc          | The High-Performance Cache. Provides means of assigning a specific amount of memory to dedicate to caching loaded nodes and relationships.
                 Small footprint and fast insert/lookup. Should be the best option for most scenarios. See below on how to configure it.
<<<<<<< HEAD
                 Note that this option is only available in Neo4j Enterprise Edition where it is the default implementation.
=======
                 This cache type is only available in the Neo4j Enterprise Edition, and is the default in that edition.
>>>>>>> upstream/2.1-maint
|==========================================----

Rendered:

hpc

The High-Performance Cache. Provides means of assigning a specific amount of memory to dedicate to caching loaded nodes and relationships. Small footprint and fast insert/lookup. Should be the best option for most scenarios. See below on how to configure it. <<<<<<< HEAD Note that this option is only available in Neo4j Enterprise Edition where it is the default implementation. ======= This cache type is only available in the Neo4j Enterprise Edition, and is the default in that edition. >>>>>>> upstream/2.1-maint

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.