We're assuming that you've arrived at this point after having completed our Drupal 8 Theme training, and that you currently have a fair amount of un-committed changes made to your local dev environment. In this exercise we'll review some basic git commands, and get our dev environments into a consistent state in preparation for our upcoming exercises.
-
Go to your drupal docroot on the command line.
-
Run the command:
git status
to view your un-committed changes.
-
We're now going to create a new branch, named after you, to store your changes. Run the command:
git checkout -b YOURNAME
replacing "YOURNAME" with... your name. The
git checkoutcommand is what we use to switch between branches, and the-bflag is telling git that we want to create a new branch before switching. -
Now that we're on a new branch we want to commit our changes. Typically we would add files one at a time using the command
git add FILENAMEand write meaningful commit messages for each change, but in the interest of saving time we're going to commit all of our files at once. From the docroot run the command:git add .Even though we're not following best practices by committing our individual changes and writing meaningful commit messages, we should still run
git statusand review our changes, making sure we're not committing anything unintentionally. We should see all of our files from the theme training in green, meaning they're "staged" or ready to be committed. -
Run:
git commit -m "Drupal 8 theme training"to commit your files, then run
git statusto make sure everything went as planned. -
If everything went as planned you should have seen
nothing to commit, working tree cleanafter runninggit status, and we're ready to switch back to the master branch. Run the command:git checkout master
-
Finally we'll run the command:
git pull
To pull in any upstream changes.
Now we should be all synced up and ready to move on to our next exercise!