You're reading from Mastering Git Attain expert-level proficiency with Git by mastering distributed version control features

Product type Paperback

Published in Aug 2024

Publisher Packt

ISBN-13 9781835086070

Length 444 pages

Edition 2nd Edition

Tools

Git

Concepts

DevOps

Author (1):

Jakub Narębski

View More author details

Table of Contents (21) Chapters

Preface

1. Part 1 - Exploring Project History and Managing Your Own Work

2. Chapter 1: Git Basics in Practice FREE CHAPTER

3. Chapter 2: Developing with Git

4. Chapter 3: Managing Your Worktrees

5. Chapter 4: Exploring Project History

6. Chapter 5: Searching Through the Repository

7. Part 2 - Working with Other Developers

8. Chapter 6: Collaborative Development with Git

9. Chapter 7: Publishing Your Changes

10. Chapter 8: Advanced Branching Techniques

11. Chapter 9: Merging Changes Together

12. Chapter 10: Keeping History Clean

13. Part 3 - Managing, Configuring, and Extending Git

14. Chapter 11: Managing Subprojects

15. Chapter 12: Managing Large Repositories

16. Chapter 13: Customizing and Extending Git

17. Chapter 14: Git Administration

18. Chapter 15: Git Best Practices

19. Index

Why subscribe?

20. Other Books You May Enjoy

Publishing your changes upstream

The Collaborative workflows section in Chapter 6, Collaborative Development with Git explained various repository setups. Here, we’ll learn about a few common patterns for contributing to a project. We’ll see what our main options for publishing changes are.

Before starting work on new changes, you should usually sync with the main development, incorporating the official version into your repository. This, and the work of the maintainer, is left to be described in Chapter 9, Merging Changes Together.

Pushing to a public repository

In a centralized workflow, publishing your changes consists simply of pushing them to the central server, as shown in Figure 6.2. Because you share this central repository with other developers, it can happen that somebody has already pushed to the branch you are trying to update (the non-fast-forward case). In this scenario, you need to pull (fetch and merge, or fetch and rebase) others’ changes...