C10-01-Hotfix Resolution.md

Fixing Clean My Car

Step 1 - Apply a hotfix

On one persons machine, perform the following steps

• git checkout master
• git checkout -b hotfix-dbcontextfix
• Implement the fix (test by running the project)
• git add .
• git commit -m "Remove extra dbset from context"
• git push origin hotfix-dbcontextfix
• Go to GitHub. You should see an alert asking if you'd like to create a pull request, which would merge hotfix-dbcontextfix into master.
• Click Create Pull Request.
• Fill out as much or as little info as you want, then click Create.
• On the next screen, click Merge Pull Request.

Step 2 - Getting the hotfix to everybody

Everybody, on their own machines:

• git checkout <your_branch>
• git pull origin master

This will pull the hotfix into your branch.

(OPTIONAL) Step 3 - Push all branches to GitHub

This isn't a required step, but it is a good point to make sure everybody's branches are on GitHub for backup purposes.

Everybody, on your machines:

• git checkout <your_branch>
• git add .
• git commit -m "Merged with master"
• git push origin <your_branch>