
The French Fry Fanatic should perform the acctions the pizza member did.


Note this would pull all the commits different from main, not just the last one. The Pizza Lover should now merge the changes from the pizza branch back to main with git merge pizza this will pull the changes from the pizza branch into the main branch. This is because the commit to save this change was made on the pizza branch and not the main branch. You will notice that the change they made is gone. What did you observe? All 3 members should look at the Pizza Party Lover's screen. (Manager wait for your teammates and then continue) Create CommitsĪfter doing so, the Pizza Party Lover should return to the main branch (via checkout) and open up the food.md file. The French Fry Fanatic Should do the same. The Pizza Party Lover should now add the files to their git staging area and then save their progress by commit their changes with a message ( -m) of 'Pizza'. If you're the Pizza Party Lover open up the food.md file and change first line of the file to be that of your favorite food (Pizza).įrench Fry Fanatic you do the same for your favorite (French Fries).īoth of you save your files and wait for further insturctions. (Manager wait for your teammates to complete your instructions and then continue) Make a Change If you are the French Fry Fanatic change to the frenchfry branch via the following command If you are the Pizza Party Lover change to the pizza branch via the following command
#Git branch code
In git you can have many branches as you want to split your code into multiple versions. If you are the French Fry Fanatic create the "branch" frenchfry via the following commandĪ branch is a copy of the entire git repository at a particular commit. If you are the Pizza Party Lover create the "branch" pizza via the following command You will notice there's only two files in the directory README.md and food.md. The repository should be the same url for the 3 of you, i.e. Both the Pizza and French-Fry roles should be in this directory before moving forward. If you haven't already, clone this repository to your local machine and navigate to that directory with your terminal. If you are the only one in your group, please try to find another group to join in temporarily for the rest of lab. If only two of your team has showed up then both of you should continue reading this document together.


If you're one of the other two then wait for close this page and await instructions from your project manager. If you're the project manager then continue reading to the other two out loud. Work with your team to decide who wants to be which.
#Git branch series
You will each work off of the same repository and perform a series of operations of Git operations. 02Add style.css file Run: touch lib/style.css File: lib/style.In this scenario you will work with your project team to become comfortatble with more advanced git. Note that the git status command reports that you are in the style branch. Note: git checkout -b is a shortcut for git branch followed by a git checkout. Since it may take some time, it is best to move these changes into a new branch to isolate them from master branch changes. It is time to make our hello world more expressive.
#Git branch how to
To learn how to create a local branch in the repository.
