Скачать или смотреть How to Update Your Branch in Git Without Deleting Your Pull Request

Learn how to keep your branch up to date with the latest changes in the main repository without losing your open pull request. Our guide explores effective methods for updating branches in Git.
---
This video is based on the question https://stackoverflow.com/q/64293515/ asked by the user 'nibble' ( https://stackoverflow.com/u/10855360/ ) and on the answer https://stackoverflow.com/a/64293874/ provided by the user 'Prasanna' ( https://stackoverflow.com/u/4158037/ ) 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: Update branch without deleting pull request made from it

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 Update Your Branch in Git Without Deleting Your Pull Request

If you are new to Git and GitHub, navigating through the intricacies of version control can sometimes feel overwhelming. One common dilemma that many developers face is needing to update their branch after a pull request (PR) has been open. This situation often arises when the original repository (based on which you created your branch) has received new commits. In this post, we will address the problem of updating your branch—let’s call it fix-a-certain-issue—so that it is aligned with the latest changes from upstream/master, all without closing or deleting your existing PR.

Understanding the Problem

After creating your branch and pushing your work to origin/fix-a-certain-issue, you have opened a PR for review. However, during the review process, the master branch of the upstream repository has moved on with new commits, and now your branch is behind by x commits. This discrepancy can lead to merge conflicts and complicate the review process. So, how can you effectively incorporate those changes into your branch while keeping your PR intact?

Solutions to Update Your Branch

You essentially have two straightforward options for updating your branch without closing the PR. Both methods will synchronize your branch with the upstream repository and allow the reviewer to see only your changes in the open PR. Let’s dive into each method:

Option 1: Merge Upstream Changes

Merge the Upstream Master: This involves merging the changes from the origin/master into your branch.

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

Handle Merge Conflicts: If there are conflicts between your changes and the upstream changes, Git will pause the merge and ask you to resolve those conflicts. You will need to manually edit affected files, marking where the conflicts occur. After resolving them:

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

Push Your Changes: Once the merge is complete, push your updates to your branch.

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

This method will create an additional merge commit in your branch history.

Option 2: Rebase Upstream Changes

Rebase on Upstream Master: Alternatively, you can choose to rebase your changes on top of the latest commits in the origin/master branch. This keeps your commit history clean by avoiding unnecessary merge commits.

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

Resolve Conflicts: Just like with merging, if there are any conflicts, Git will stop and allow you to resolve them. After manually editing the files for resolution:

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

Push Your Changes: Finally, push your changes. Note that you may need to use the --force option if rebasing modifies existing commits.

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

This method will streamline your commit history, showing only your changes without merge commits.

Summary

In summary, keeping your branch fix-a-certain-issue up to date with upstream/master while keeping your pull request open is manageable with two effective options: merging or rebasing. Merging is straightforward and preserves the history but introduces a merge commit, while rebasing offers a cleaner history at the cost of potentially more complex conflict resolution.

Choose the method that best fits your workflow and preference, and you'll be able to contribute your changes without losing any progress on your pull request. Happy coding!