Trunk-based development in Git - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to switch to the main branch in Git.

Git

git checkout [1]

Drag options to blanks, or click blank then click option'

Afeature

Brelease

Cmain

Ddevelop

Attempts:

3 left

💡 Hint

Common Mistakes

Using a feature branch name instead of the main branch.

Typing 'master' when the main branch is named 'main'.

The main branch is usually called main in trunk-based development. This command switches your working directory to that branch.

2fill in blank

medium

Complete the command to create a new short-lived feature branch from main.

Git

git checkout -b [1] main

Drag options to blanks, or click blank then click option'

Afeature-login

Bhotfix

Crelease-v1

Dmain

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'main' as the new branch name, which already exists.

Using long-lived branch names like 'release-v1' in trunk-based development.

In trunk-based development, feature branches are short-lived. Here, feature-login is a descriptive name for the new branch.

3fill in blank

hard

Fix the error in the command to merge the feature branch back into main.

Git

git checkout main
 git [1] feature-login

Drag options to blanks, or click blank then click option'

Apush

Bbranch

Ccommit

Dmerge

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git commit' instead of 'git merge'.

Trying to push before merging.

To combine changes from the feature branch into main, you use git merge.

4fill in blank

hard

Fill both blanks to push the main branch and delete the feature branch locally.

Git

git [1] origin main
 git branch [2] feature-login

Drag options to blanks, or click blank then click option'

Apush

Bpull

Cdelete

D-d

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git pull' instead of 'git push' to send changes.

Using 'git branch delete' which is invalid syntax.

First, you push the main branch to the remote with git push origin main. Then, you delete the local feature branch with git branch -d feature-login.

5fill in blank

hard

Fill all three blanks to fetch updates, rebase your feature branch on main, and then push it.

Git

git [1]
git checkout feature-login
git [2] main
git [3] origin feature-login

Drag options to blanks, or click blank then click option'

Afetch

Brebase

Cpush

Dmerge

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git merge' instead of 'git rebase' in trunk-based development.

Pushing before rebasing, which can cause conflicts.

First, fetch updates from the remote with git fetch. Then, rebase your feature branch on main with git rebase main to keep history clean. Finally, push your rebased branch with git push origin feature-login.