Merge a GitHub Pull Request to Local Repo

There are 2 ways:

Using GitHub CLI gh

If local branch has the same base branch as upstream:

gh PR checkout {PR#}

Using Patch Files

If local branch diverges from the branch in which the PR is based, then we need to create patc...

We use a process called pull request, or PR for short, to contribute to open source.

Prerequisites

We need a fork repo in our GitHub account and in our local machine. See this [guide](https://makandracards.com/kiat_git/68235-how-to-update-a-...

Scenario

2 to 3 remote repositories in GitHub and 2 local repositories:

1. [GitHub] Go to an owner repository (eg OpenMage).
2. [GitHub] Fork owner's repository (from item 1).
3. [GitHub or BitBucket] Our application with custom code.
4. [Loca...

Create Local Repository

1. Download GitHub for Windows or use something similar, which includes a shell
2. Launch Git Shell
3. In the shell, navigate to the directory with cd
4. git init to create a local repository
   ...

I wrote some code in some files in a folder called AA. I have a repo in remote in Bitbucket. Here're the steps to link my local to remote using TortoiseGit:

1. Create a repo for the folder AA: Navigate to the folder in windows explorer and ri...

Deprecated method. Use this instead. See also [this](https://makandracards.com/kiat_git/485037-how-to-r...

For examples,

1. There are recent commits to branch A, but the commits should have been in branch B. To fix this, in branch A, use TortoiseGit to rebase to branch B.
2. There is a new default branch called main but your PR was based on an olde...

Better way is use .gitattributes, see Merge Strategies

Use Case

If we use an open source in our project, e.g. [OpenMage](https://github.com/OpenMage/magento-l...

Scenario

Magento 1 is end of life. I want to migrate an existing Mage repo to the latest from Magento - Long Term Support maintained by OpenMage .

Warning: the follow...

If I want to compare changes on a topic branch to master, I find it easiest and safest to do the following:

git checkout master
git checkout -b trial_merge
git merge topic_branch

After completing the merge, it is easy to see the cons...