Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pio-settings: fix typo #5526

Merged
merged 1 commit into from
Mar 30, 2021
Merged

Conversation

marchersimon
Copy link
Collaborator

Reference: #5522 (comment)

@marchersimon marchersimon added the page edit Changes to an existing page(s). label Mar 28, 2021
@marchersimon
Copy link
Collaborator Author

How do I get rid of those first two commits I have in every PR?

@bl-ue
Copy link
Contributor

bl-ue commented Mar 28, 2021

Run this:

git checkout master
git remote add upstream git@github.com:tldr-pages/tldr.git  # only run this if you don't already have the upstream remote
# for https: https://github.com/tldr-pages/tldr.git

git fetch upstream master  # pulls latest changes from main repo (but doesn't actually add them)
git rebase upstream/master  # adds changes just fetched (note the slash vs. the space in the other command)
git push  # may need --force

That will update your master branch (and remove merge commits.)

From now on, whenever you want to update your master branch, run the last three commands (fetch, rebase, push) locally, instead of creating a PR on your fork on GitHub.

To fix this PR, I ran the last three commands with this PR's branch checked out.

I recommend that you update your master branch thus every time before you create a new branch 👍🏻

@bl-ue bl-ue merged commit d6ff16f into tldr-pages:master Mar 30, 2021
@marchersimon marchersimon deleted the pio-settings-fix branch March 30, 2021 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
page edit Changes to an existing page(s).
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants