From d68329dee604bb9143b531b141dc6d60e102e064 Mon Sep 17 00:00:00 2001
From: Scott Richmond <s.richmond@utoronto.ca>
Date: Wed, 20 Dec 2023 19:38:18 -0500
Subject: [PATCH] Add `just merge`

---
 justfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/justfile b/justfile
index a1ef38e..f257cca 100644
--- a/justfile
+++ b/justfile
@@ -1,2 +1,6 @@
 push:
 	jj git push -c @-
+
+merge:
+	jj branch set main -r @-
+	jj git push -b main