seLain
/ gist:8bdf12c7196f3fccafdf067dec2696b2
Last active
October 16, 2024 13:56
Fix the thing GitHub keeps saying “This branch is X commits ahead, Y commits behind”
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ref stackoverflow: | |
| https://stackoverflow.com/questions/41283955/github-keeps-saying-this-branch-is-x-commits-ahead-y-commits-behind | |
| works by | |
| 1. git remote add upstream https://github/upstream/repo.git | |
| 2. git pull --rebase upstream master | |
| 2.1 git rebase --skip (if the conflicts are not true, skip the patches) | |
| 3. git push --force-with-lease origin master | |
| If there are branches to fix |