git Best Practices

main is prod

dev is checked out from main

feature checked from dev

merge feature back to dev

merge dev back to main

ensures main and dev in sync

If in the case main is ahead of dev and want to update dev to main, "So what you're saying is you want to bring the changes from your master branch, into your dev branch? Switch to dev branch with a git checkout dev . Then git pull --rebase origin master "

Submodules

adding submodule with different name

git submodule [--name <name>] <repository> [<path>]