Скачать или смотреть How to Create a New Branch with Committed but Unpushed Changes in Git

Learn how to create a new branch in Git from committed but unpushed changes while keeping your main branch clean and ready for collaboration.
---
This video is based on the question https://stackoverflow.com/q/68377268/ asked by the user 'SPQRInc' ( https://stackoverflow.com/u/7510971/ ) and on the answer https://stackoverflow.com/a/68378950/ provided by the user 'padawin' ( https://stackoverflow.com/u/3866623/ ) 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: Create a new branch with committed, but unpushed changes

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 Create a New Branch with Committed but Unpushed Changes in Git

If you're working with Git, you know how powerful and flexible it can be for managing your code. However, sometimes, the workflow can get a bit tangled, especially when it comes to branching and committing changes. One common scenario is when you've committed changes on your main branch but haven’t pushed them to the remote repository yet. What if you wish to create a new branch from these committed changes and clean up your main? If this resonates with you, then you’re in the right place!

The Problem

Imagine you have a Git repository with a main branch. You've been actively developing and committing several new features on this branch, but they haven't been pushed to the remote repository. Now, you want to switch to another computer and carry over those changes without cluttering the main branch. The goal is to create a new branch, let’s call it version3, that includes all your unpushed changes while keeping your main branch clean until you are ready to merge.

The Solution

Step 1: Create a New Branch from Main

The first step is to create a new branch, version3, based on your current main, and switch to it. You can do this by executing the following command in your terminal:

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

This command does two things:

It creates a new branch named version3 based on your current main branch.

It checks out (switches) to the new branch immediately.

Step 2: Push Your New Branch to Remote

Next up, you want to push this new branch to the remote repository. This will ensure that you can easily access it from your other computer. Use the following command:

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

The -u flag is crucial here as it sets the upstream tracking for your local branch to the remote branch. This means that future pushes and pulls will be easier as Git knows to which remote branch your local branch corresponds.

Step 3: Clean Up Your Main Branch

Now that you have successfully created and pushed your new branch with all the unpushed changes, it’s time to go back to your main branch and remove those recent commits you no longer want there. Execute this command:

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

Explanation of the Commands:

git checkout main: This switches you back to the main branch.

git reset --hard origin/main: This command resets your main branch to match the state of the remote main branch. All commits, including the ones you just moved to version3, will be removed from main and your working directory will also align with it.

Verification

After performing these steps, you can verify the state of your branches. Check your main branch to ensure it no longer contains the new features you were working on. You can also switch to your version3 branch to confirm that all your commits have transferred successfully.

Conclusion

Creating a new branch from committed but unpushed changes while keeping your main branch clean is a straightforward process in Git. By following the above steps — creating a new branch, pushing it to the remote, and resetting main — you can manage your workflow efficiently. This allows you to switch contexts without losing track of your ongoing work, especially when collaborating on projects.

Whether you're switching computers or fine-tuning your Git habits, understanding how to efficiently manage branches is an essential skill for developers. Happy coding!