Git

Dev developing procedure

• checkout a new branch called "feature_branch"
• make modifications
• commit, push
• pull main, update to latest
• merge main to feature_branch with git rebase main
• resolve conflicts and commit
• push feature_branch to remote with git push -f origin feature_branch
• create pull request
• once approved (squash and merge), delete remote feature_branch