Skip to content

Latest commit

 

History

History
40 lines (31 loc) · 1.44 KB

README.md

File metadata and controls

40 lines (31 loc) · 1.44 KB
Raw

Git Kata: Fast-forward Merge

Setup

  1. Run source setup.sh (or .\setup.ps1 in PowerShell)

The task

You again live in your own branch, this time we will be doing a bit of juggling with branches, to show how lightweight branches are in git.

  1. Create a (feature)branch called feature/uppercase (yes, feature/uppercase is a perfectly legal branch name, and a common convention).

  2. Switch to this branch

  3. What is the output of git status?

  4. Edit the greeting.txt to contain an uppercase greeting

  5. Add greeting.txt files to staging area and commit

  6. What is the output of git branch?

  7. What is the output of git log --oneline --graph --all

    Remember: You want to update the master branch so it also has all the changes currently on the feature branch. The command 'git merge [branch name]' takes one branch as argument from which it takes changes. The branch pointed to by HEAD (currently checked out branch) is then updated to also include these changes.

  8. Switch to the master branch

  9. Use cat to see the contents of the greetings

  10. Diff the branches

  11. Merge the branches

  12. Use cat to see the contents of the greetings

  13. Delete the uppercase branch

Useful commands

  • git branch
  • git branch <branch-name>
  • git branch -d <branch-name>
  • git switch
  • git branch -v
  • git add
  • git commit
  • git commit -m
  • git merge <branch>
  • git diff <branchA> <branchB>
  • git log --oneline --graph --all