From ddf3aee4c5ae0ce0a7dfa363916e688353d7e060 Mon Sep 17 00:00:00 2001
From: PAlexanderFranklin <PAlexanderFranklin@gmail.com>
Date: Mon, 11 Mar 2024 16:48:47 -0700
Subject: [PATCH] Add git workflow

---
 GITMERGE.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 GITMERGE.md

diff --git a/GITMERGE.md b/GITMERGE.md
new file mode 100644
index 0000000000..fe20665346
--- /dev/null
+++ b/GITMERGE.md
@@ -0,0 +1,24 @@
+## Merging a Branch:
+
+`git checkout <to-merge>`
+`git pull`
+`git push`
+`git checkout <merge-into>`
+`git pull`
+`git merge <to-merge>`
+`git push`
+`git tag archive/<to-merge>`
+`git branch -d <to-merge>`
+`git push --tags`
+`git push -d origin <to-merge>`
+`git remote prune origin`
+
+## branch management
+
+"develop" is the upstream branch. We will keep it clear of our own commits (unless we want to request that they are pulled upstream)
+Here is the command to make a remote for the upstream to fetch new changes from into develop, which we can then merge into master:
+
+`git remote add upstream https://github.com/frappe/erpnext.git`
+
+"production" should rebase onto master to deploy
+other branches should branch off of master and get merged back into it.