Скачать или смотреть How to Manage Multiple Features in a GitHub Repository Without Causing Conflicts

Learn how to efficiently work on multiple features in a GitHub repo while avoiding PR conflicts with step-by-step guidance.
---
This video is based on the question https://stackoverflow.com/q/64594620/ asked by the user 'Josh Bangle' ( https://stackoverflow.com/u/11839259/ ) and on the answer https://stackoverflow.com/a/64594899/ provided by the user 'Michał Turczyn' ( https://stackoverflow.com/u/7132550/ ) 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: Question about working on multiple changes to a github repo at once

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.
---
Managing Multiple Changes in a GitHub Repository: A Step-by-Step Guide

As a new developer working on a large project hosted on GitHub, you may find yourself facing challenges when trying to develop multiple features simultaneously. If you’ve recently added functionality, pushed it, and opened a Pull Request (PR), you might wonder how to continue working on new features while waiting for your PR to be merged. This guide addresses that concern and provides you with a clear solution to avoid conflicts and streamline your workflow.

The Problem: Working Around an Ongoing PR

When you’ve created a PR, the branch you used contains the latest code additions or modifications, which may be required for new features you want to develop. The dilemma is whether to keep working on the same branch or switch to another branch without access to the latest code in your PR.

Here’s a quick recap of your options:

Continue working on the same branch until the PR is merged, risking conflicts with further changes in the future.

Switch back to the master branch, which lacks the code from your PR, limiting your ability to develop new features.

Both choices have drawbacks, and you're right to seek a more efficient approach.

The Solution: Creating a New Branch from Your Current PR

The best practice in this scenario is to create a new branch that branches off your current PR branch. This way, you can work on your new feature while having access to all the necessary code. Here’s how to do it step-by-step:

Step 1: Identify your Branch

Assume your current branch with the open PR is called newFeature. Before creating a new branch, ensure you are on the correct branch by executing:

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

Step 2: Create a New Feature Branch

Next, you can create a new branch that allows you to continue your work without interrupting the PR. Use the following command:

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

Explanation of Commands:

git checkout newFeature: This command switches your working directory to the existing branch containing the current changes.

git checkout -b extendedFeature: This command creates a new branch called extendedFeature based on your newFeature branch. Now, you have all the necessary code and can work on your new feature immediately!

Step 3: Continue Development

Now that you have the extendedFeature branch set up, you can proceed with developing your new feature. Since this branch includes everything from newFeature, you can reference the code as needed. Once you're ready, you can push the new branch to GitHub and create a second PR when your feature is complete.

Conclusion

By creating a new branch based on the existing branch with your open PR, you can continue developing without worrying about conflicts or losing access to important code. This method fosters a seamless transition between working on multiple features while ensuring that your code remains organized and manageable.

This approach is not only effective, but it also aligns with best practices in collaborative development, helping you to navigate project complexities confidently.

Now that you know how to handle multiple changes in your GitHub repository efficiently, you can focus on writing great code and enhancing your project without the stress of conflicting changes!