Скачать или смотреть How to Handle Future Work Over Unmerged Features in Git Flow?

Discover a practical solution for managing work on Git branches when features are not yet merged. Learn how to use branch anticipation effectively!
---
This video is based on the question https://stackoverflow.com/q/64478432/ asked by the user 'minty99' ( https://stackoverflow.com/u/2179098/ ) and on the answer https://stackoverflow.com/a/64478635/ provided by the user 'Schwern' ( https://stackoverflow.com/u/14660/ ) 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 handle future work over unmerged features in git flow?

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.
---
How to Handle Future Work Over Unmerged Features in Git Flow?

Using Git Flow is a great way to manage your feature development in a streamlined way. However, you may encounter situations where you've created pull requests for your features, but they haven't been approved or merged yet. This can leave you in limbo if you want to start working on future commits that rely on these unmerged features. Let's delve into how you can effectively manage this scenario.

The Challenge

Imagine you have two features, let's call them Feature A and Feature B. You've created pull requests for both features to be merged into the develop branch on GitHub. However, until these features are reviewed and merged, you find yourself wanting to continue your work without being held back by this delay. How do you proceed without conflicting with the existing unmerged branches?

The Solution: Anticipating a Branch

This process is often referred to as anticipating a branch. Here are the steps to manage your work effectively while waiting for those features to be merged.

Step 1: Create a New Branch from Your Feature

Start by creating a new branch (let's call it Branch C) off of Feature A. This new branch will inherit the content of Feature A, allowing you to base your new work on it.

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

Step 2: Merge Feature B into Branch C

Now, you want to incorporate the changes from Feature B into your new branch. This will ensure that Branch C has all the work from both features A and B.

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

Step 3: Tag the Merge Commit

It’s a good practice to tag the merge commit on Branch C to reference where this branch started. This will be helpful later when you need to manage the commits.

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

Step 4: Make Your Changes

Now you can proceed to make any additional changes in Branch C. This allows you to develop your work independently of the pull request review process for Feature A and Feature B.

Step 5: Update Based on Merged Changes

Once your reviewers have merged Feature A and Feature B into the master branch, it’s time to integrate those updates into Branch C. Pull the latest changes from master to ensure you are working with the latest code.

Next, you'll want to take the commits from Branch C and reapply them onto master. To do this without including the original commits from A and B, you'll use the tag you created earlier.

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

Final Step: Submit Your Work as a Pull Request

Now that Branch C has been updated to include the latest changes from master, it’s ready to be submitted as a new pull request. This ensures that your work is up to date with all the latest features that have been merged.

Conclusion

Managing your development workflow in Git Flow when faced with unmerged features might seem daunting at first. However, by following these steps to anticipate your working branches, you can continue to develop new features without getting stuck in the pull request review cycle.

This method maintains a clean project history and ensures that your final code submissions are always aligned with the most current version of your project.

Remember, the key takeaway here is to create a new branch off your current features, merge as necessary, commit changes, and rebase to keep everything tidy. Happy coding!