How to Rebase to Another Branch in GitHUb
For examples,
- 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.
- There is a new default branch called
main
but your PR was based on an older branchmaster
. To fix this, inmaster
, rebase tomain
. - When the maintainer requests to rebase to another branch
Related cards:
Deprecated - How to Remove Unwanted Files Before Merging an Upstream Branch to Master and Staging
Deprecated method. Use this instead. See also [this](https://makandracards.com/kiat_git/485037-how-to-r...
How to Contribute to Open Source Project in GitHub
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-...
How to remove commits from a branch
I am bad at GIT CLI. I needed to remove a couple of commits from a branch. I did it using TortoiseGit. Here are the steps. First, right click Tortoisegit in the File Explorer and open the Rebase... window:
.
- [GitHub] Fork owner's repository (from item 1).
- [GitHub or BitBucket] Our application with custom code.
- [Loca...
How to migrate to Magento LTS with git with combined histories
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...
Merge a GitHub Pull Request to Local Repo
When we need to test a PR in github or we want to incorporate a PR, we can checkout the PR locally.
To check out a pull request locally, use the gh pr checkout subcommand. Replace pull-request with the number, URL, or head branch of the pull requ...
How to create new repo on existing code and link to remote
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:
- Create a repo for the folder AA: Navigate to the folder in windows explorer and ri...
How to deploy the code to shared host with git
Push Git Repo Into Shared Hosting Account Like Hostgator
What's required is that git client is install in the host.