Hide navigation sidebar

Hide table of contents sidebar

Skip to content

Toggle site navigation sidebar

Git Workshop main documentation

Toggle table of contents sidebar

Git Workshop main documentation

Chapters

1. Introduction
2. Configuration
3. Setting Up A Repository
4. The Commit
5. Handling Changes
6. Inspecting A Repository
7. Branches
8. Tags
9. Stash
10. Remotes
11. Merging changes
12. Rebasing branches
13. Revisions
14. Collaboration platforms
15. Issues
16. Merge requests
17. Forking
18. Safety net
19. Git Workflows

Exercises

1. My First Repository
2. Committing Is Fun
3. Inspector Gitget
4. Checkout All The Tgings
5. Remote Actions
6. The Urge To Merge
7. Rebase In Deep Space
8. Fork Me, Baby
9. Safety First

Toggle table of contents sidebar

11. Merging changes¶

11.1. Merge branch¶

11.2. Cherry picking¶

Note

After completing this chapter, you should be able to execute the The Urge To Merge exercise.

12. Rebasing branches

Copyright © 2025, confirm IT solutions

Made with Sphinx and @pradyunsg's Furo

On this page

11. Merging changes
- 11.1. Merge branch
- 11.2. Cherry picking