Merge pull request #27 from okfn/23_resync_docs

How to resync
okfn · Jan 4, 2023 · 2e00d00 · 2e00d00
2 parents 2ffa00c + 9347bfe
commit 2e00d00
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Next release
  - Fix tests [#26](https://github.com/okfn/okfn-collaborative-docs/pull/26)
+ - Some help to resync with upstream [#27](https://github.com/okfn/okfn-collaborative-docs/pull/27)
 
 ### 0.2.1
 2023-01-03 [#24](https://github.com/okfn/okfn-collaborative-docs/pull/24)

diff --git a/docs/re-sync.md b/docs/re-sync.md
@@ -0,0 +1,11 @@
+# Re sync with upstream template
+
+One way to do it could be:
+
+```bash
+git remote add upstream [email protected]:okfn/okfn-collaborative-docs.git
+git fetch upstream
+git rebase upstream/main main
+# Resolve conflicts if any
+git push -f origin main
+```