Merge branches into main - UCSB-MEDS/shiny-dashboard GitHub Wiki

Once you are satisfied with the updated and functioning dashboard, and changes have been reviewed by others on the team, you can merge your changes across all repositories into the main branches. Repeat the following steps for each repo (shiny-dashboard, career-data, admissions-data)

  • 1. Stage, commit, and push any final changes to your branch
  • 2. In your GitHub repository, go to Pull requests and click New pull request.
  • 3. From the compare: main dropdown on the right, select your branch, then click Create pull request.
  • 4. Add a title and description, then click Create pull request
  • 5. Scroll to the bottom of the pull request and click Merge pull request. Click Confirm merge. You may now also delete your branch from GitHub (this is good practice)
  • 6. Return to RStudio / your local repository and checkout your main branch:
git checkout main
  • 7. Pull the merged changes to your main branch:
git pull
  • 8. Delete your local copy of your branch, e.g.
git branch -d csik-spring25-updates