ARGO-23 Steps for merging new code into main from a branch. 1. Commit and push all your code on your branch. 2. Switch to main branch and ensure the newest version is pulled down. 3. Switch back to your feature branch and merge main into it if possible. Fix any merge errors that arise and push the merge commits. 4. Switch back to Main and merge your feature branch into main and push