<aside> 💡 To begin with GitHub, first, clone the repository to your computer. We can do this by opening the repository on GitHub and clicking the green Code button at the top—use whatever method works best for you! This is now your local copy.

</aside>

A more detailed version of this lifecycle is available here.

Front end: https://github.com/techfleetworks/feedback-phase-1

Back end: https://github.com/techfleetworks/feedback-be-phase-1

1. Create a branch off of the main branch

Name the branch with your first name pre-pended, followed by the feature you will work on that coding session:

name-branchname for example, christa-header

2. Write some cool code, then commit it

As you’re working, it’s a good idea to “save your work” by committing to your branch. This can be done through VSCode, but can also be done from the terminal:

1. git add .
2. git commit -m “enter message about the changes you made here”

3. Pull updates from the repo

While you’ve been working, it’s possible that others have updated the repo with their own changes. Before merging your own updates, be sure to check for this by pulling from the repo. Make sure you note what the branch name you’re working in is called, as you’ll need to reference it later.

1. git checkout main → Moves you into the main branch.
2. git pull → Pulls the live version of main into your local copy.
3. git checkout name-branchname → Moves you into your working branch.
4. git merge main → Merges the new, local version of main that you just pulled into your previous working branch. ✨it’s magic✨

   1. It’s possible that you now have a merge conflict from the updates you just pulled. This happens when another developer changed the same code you did.

      1. When this happens, follow the instructions in your terminal to open the files where the merge conflicts are happening and resolve the conflicts.

      <aside> 💡

      Here you can choose to keep the changes you’ve made (current changes), delete your changes to accept the incoming changes, or keep both (but this will rarely be a solution except in styling instances). Please reach out to the branch owner of the incoming changes if you have questions!

      </aside>

      1. Once you’ve fixed all the merge conflicts, you can recommit your branch.
         1. git add .
         2. git commit -m “fixing merge conflicts”

4. Push your changes