getsolus / getsolus/help-center-docs
Additions to git tips & tricks - recover from a botched PR job
Open
Nobody has claimed this yet.
hacktoberfest
- Dominant language
- TypeScript
- Stars
- 59
- Forks
- 93
- Avg merge
- 7h 38m
- Merged PRs (30d)
- 11
Description
git fetch
gh pr checkout $PR_ID
git rebase origin/master
# Deal with conflicts
git push --force
OR
git checkout master && git pull
git cherry-pick $COMMIT_ID # get this from the PR
# Fix conflicts
git push
# Go back to PR and manually close it using the commit on master
OR (when the branch lives outside of the getsolus org)
git checkout master && git pull
gh pr checkout $PR_ID
git log # get the commit ID
git checkout master
git cherry-pick $COMMIT_ID
# Deal with conflicts
git push
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Locate the git tips and tricks page in the documentation, then review the supplied fetch, rebase, cherry-pick, and conflict-recovery examples. Add the recovery guidance for a botched PR job, including the outside-org branch case, and verify the page matches the surrounding documentation.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, github
- Domain
- documentation
- Issue type
- Documentation
- Difficulty
- 2/5
- Estimated time
- 1-3 hours
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 55/100