What Next

At this point, things start to get a bit more complicated.
Depending on the situation, the next git commands you need to run will change.
Following are some common scenarios that you might find yourself in while coding:

  • You've taken a break and are ready to start working again. This means you will need to pull any changes that might have been made to dev and merge those into your feature branch.
    This process may introduce merge conflicts. More information on merging and resolving merge conflicts can be found here.
  • You are done with your feature and are ready to merge it into dev. This means you will need to create a pull request for your feature.

If you find yourself in a situation not covered here, that's ok. As long as you have a strong understanding of git and remember the critical reminders on the previous page, you should be just fine.