diff --git a/docs/developer/README.md b/docs/developer/README.md index 3acd9266f..1e2c54926 100644 --- a/docs/developer/README.md +++ b/docs/developer/README.md @@ -24,6 +24,7 @@ We use the branch convention of `initials/branch-topic` (ex: `lmm/fix-footer`). ## Merging and PRs +History preservation and merge contexts are more important to us than a clean and linear history, so we will merge instead of rebasing. To bring your feature branch up-to-date wih main: ``` @@ -34,6 +35,11 @@ git merge orgin/main git push ``` +Resources: +- [https://frontend.turing.edu/lessons/module-3/merge-vs-rebase.html](https://frontend.turing.edu/lessons/module-3/merge-vs-rebase.html) +- [https://www.atlassian.com/git/tutorials/merging-vs-rebasing](https://www.atlassian.com/git/tutorials/merging-vs-rebasing) +- [https://www.simplilearn.com/git-rebase-vs-merge-article](https://www.simplilearn.com/git-rebase-vs-merge-article) + ## Setting Vars Non-secret environment variables for local development are set in [src/docker-compose.yml](../../src/docker-compose.yml).