From be228dd49d19f208efac6c14119defa58c5af830 Mon Sep 17 00:00:00 2001
From: Arne Fischereit <79841228+arnefischereit@users.noreply.github.com>
Date: Tue, 21 Nov 2023 09:44:50 +0100
Subject: [PATCH 1/2]  Replaced deprecated pattern (#780)

Cross-references in CREATE statements are deprecated, as their semantics
are often unclear.
---
 modules/ROOT/pages/styleguide.adoc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/ROOT/pages/styleguide.adoc b/modules/ROOT/pages/styleguide.adoc
index c25e12428..3c1fade57 100644
--- a/modules/ROOT/pages/styleguide.adoc
+++ b/modules/ROOT/pages/styleguide.adoc
@@ -374,17 +374,27 @@ RETURN count(vehicle)
 .Bad
 [source, cypher, indent=0]
 ----
+<<<<<<< HEAD
 CREATE (a:End {prop: 42}),
        (b:End {prop: 3}),
        (c:Begin {prop: id(a)})
+=======
+MATCH (kate:Person {name: 'Kate'})-[r:LIKES]-(c:Car)
+RETURN c.type
+>>>>>>> e06eda8 ( Replaced deprecated pattern (#780))
 ----
 +
 .Good
 [source, cypher, indent=0]
 ----
+<<<<<<< HEAD
 CREATE (a:End {prop: 42}),
        (:End {prop: 3}),
        (:Begin {prop: id(a)})
+=======
+MATCH (:Person {name: 'Kate'})-[:LIKES]-(c:Car)
+RETURN c.type
+>>>>>>> e06eda8 ( Replaced deprecated pattern (#780))
 ----
 
 * Chain patterns together to avoid repeating variables.

From fa91c6e6d239d796abc1219cd832394d249fdc04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Pryce-=C3=85klundh?=
 <112686610+JPryce-Aklundh@users.noreply.github.com>
Date: Tue, 21 Nov 2023 16:14:13 +0100
Subject: [PATCH 2/2] fix

---
 modules/ROOT/pages/styleguide.adoc | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/modules/ROOT/pages/styleguide.adoc b/modules/ROOT/pages/styleguide.adoc
index 3c1fade57..dc10a3278 100644
--- a/modules/ROOT/pages/styleguide.adoc
+++ b/modules/ROOT/pages/styleguide.adoc
@@ -374,27 +374,15 @@ RETURN count(vehicle)
 .Bad
 [source, cypher, indent=0]
 ----
-<<<<<<< HEAD
-CREATE (a:End {prop: 42}),
-       (b:End {prop: 3}),
-       (c:Begin {prop: id(a)})
-=======
 MATCH (kate:Person {name: 'Kate'})-[r:LIKES]-(c:Car)
 RETURN c.type
->>>>>>> e06eda8 ( Replaced deprecated pattern (#780))
 ----
 +
 .Good
 [source, cypher, indent=0]
 ----
-<<<<<<< HEAD
-CREATE (a:End {prop: 42}),
-       (:End {prop: 3}),
-       (:Begin {prop: id(a)})
-=======
 MATCH (:Person {name: 'Kate'})-[:LIKES]-(c:Car)
 RETURN c.type
->>>>>>> e06eda8 ( Replaced deprecated pattern (#780))
 ----
 
 * Chain patterns together to avoid repeating variables.