Скачать или смотреть Mastering Parallel Development and Small Merges in Git

Explore effective strategies for carrying out parallel development and managing small merges in Git with ease.
---
This video is based on the question https://stackoverflow.com/q/63188406/ asked by the user 'Torque' ( https://stackoverflow.com/u/1202894/ ) and on the answer https://stackoverflow.com/a/63188923/ provided by the user 'Omer Tuchfeld' ( https://stackoverflow.com/u/791430/ ) at 'Stack Overflow' website. Thanks to these great users and Stackexchange community for their contributions.

Visit these links for original content and any more details, such as alternate solutions, latest updates/developments on topic, comments, revision history etc. For example, the original title of the Question was: How to carry out parallel development and 'small' merges in multiple branches in Git

Also, Content (except music) licensed under CC BY-SA https://meta.stackexchange.com/help/l...
The original Question post is licensed under the 'CC BY-SA 4.0' ( https://creativecommons.org/licenses/... ) license, and the original Answer post is licensed under the 'CC BY-SA 4.0' ( https://creativecommons.org/licenses/... ) license.

If anything seems off to you, please feel free to write me at vlogize [AT] gmail [DOT] com.
---
Mastering Parallel Development and Small Merges in Git

As developers, we often find ourselves juggling multiple branches in a version control system like Git. This can become particularly complex when we want to develop long-lived features without cluttering our main branch with unfinished code. In today’s post, we’ll discuss how to carry out parallel development and manage small merges effectively in Git.

The Challenge of Parallel Development

Imagine you have a clean master branch and several feature branches that you’ve created over time, each merging back into master relatively quickly. Here’s a simplified view of your situation:

Your master branch (let's call it m) maintains a linear history.

You regularly merge short-lived feature branches like F1, F2, which allows for clean and efficient development.

Now, suppose you want to start a new long-lived branch for enhancing logging in your application, named LD. Here lies the challenge:

You want to leverage the changes in LD for your upcoming feature branches (Fn+ 1), but you don’t want to merge LD into master until it’s fully complete.

Your goal is to find a way to temporarily integrate the LD changes into a feature branch (Fn+ 1) and then "unmerge" these changes before merging Fn+ 1 back into master.

A Step-by-Step Solution

1. Checking Out the Long-Lived Branch

To start, you’ll need to get the latest state of your LD branch.

[[See Video to Reveal this Text or Code Snippet]]

2. Creating a New Feature Branch

Once you're on the LD branch, create a new feature branch for your upcoming changes. This newly created branch will allow you to work without affecting LD directly.

[[See Video to Reveal this Text or Code Snippet]]

3. Develop Your Feature

Now, you can start developing your features in the f500 branch. Remember to commit your work frequently to keep a good history of changes.

[[See Video to Reveal this Text or Code Snippet]]

4. Preparing to Merge with Master

When you’re ready to bring your changes into the master branch, it’s time to rebase. The idea is to "move" your f500 branch so it appears as if it was branched directly from master after merging in the LD functionality.

[[See Video to Reveal this Text or Code Snippet]]

5. Keep Dependencies in Mind

It's crucial to note that if any of your f500 code is dependent on changes made in the LD branch, it won’t work properly after you rebase. Make sure that you never commit code that relies on LD while in the f500 branch. This careful consideration will help prevent issues when it comes time to merge back into master.

Conclusion

By following the steps outlined above, you can effectively manage parallel development and small merges in Git. This strategy allows you to take advantage of the ongoing work in the LD branch while keeping your master branch clean and stable. Always stay mindful of code dependencies, and you'll find that managing multiple branches can be a seamless experience.

Happy coding, and may your Git merges be ever in your favor!