Merging Branches in Git Activity

For this activity, you should start with a prepared repo. To get started, follow these steps.

cd into your workspace folder.

Clone the example repo:

git clone git@github.com:human-se/git-demo-app-2023-08fall.git git-merging-demo-app

cd into the working tree.

Remove the existing remote repo:

git remote remove origin

Run the gloga command.

You should see a Git log graph that looks like this:

* 3b75b4a (HEAD -> main) Update people index to use tabular layout
* 312f380 Add root route
* ac33c1a Add Person model and scaffold pages
* 29dd053 Add new app skeleton

Press Q to quit out of the gloga screen.

As a final step before you start the activity, initialize the project and open it in VS Code:

bundle install
rails db:migrate:reset
code ./

Start the activity!

Next ⏵