Update README.md (#408)

* Update README.md Include details about rebasing your branch with preferred method.
juju · Feb 16, 2024 · 2d699ff · 2d699ff
1 parent 3f7dc79
commit 2d699ff
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -106,6 +106,22 @@ make testmicrok8s
 ```
 _Note:_ Acceptance tests create real resources.
 
+### Staying in sync
+
+To simplify staying in sync with upstream, give it a "remote" name:
+
+```shell
+git remote add upstream https://github.com/juju/terraform-provider-juju.git
+```
+
+Make sure your local copy and GitHub fork stay in sync with upstream:
+
+```shell
+git pull upstream/main --rebase
+```
+
+Merge commits for sync actions will be rejected.
+
 ### Adding Dependencies
 
 This provider uses [Go modules](https://github.com/golang/go/wiki/Modules).