question-mark
Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

recently force pushed to master

See original GitHub issue

Just a notice that I recently force pushed to master since a PR was merged to master without being squashed into one commit first. I did this to keep the commit history on the master branch clean. This was a one time mix up that will not be a common thing in pipx (new maintainers are coming up to speed on pipx’s conventions). Sorry for the inconvenience. The content is identical, but it cleaned up some merge history from a pull request that wasn’t squashed.

Pull requests 251, 260, and 247 were rebased and squashed into three commits instead of a few dozen. The original commit history can be found in the branch master-not-squashed in case you need it. You can diff the two branches and see they are identical. I’ll erase that branch after a few weeks.

The new HEAD of master is 18eb430d7b7dfd3f3f1161cd8efc15fb74aee994. There were three commits rebased onto “Change venv_metadata_inspector to support venv python 3.5+” (ba6ce46830c381018195211c251e9aa0b7d8103e).

Outstanding pull requests may have to rebase onto origin/master:

git checkout <branch>
git fetch
git rebase origin/master
# if you hit conflicts, you can probably run `git rebase --skip` several times and it will end up in the correct state
# confirm everything looks good, then...
git push origin <branch> --force

Issue Analytics

  • State:closed
  • Created 4 years ago
  • Comments:9 (5 by maintainers)

github_iconTop GitHub Comments

1reaction
cs01commented, Nov 4, 2019

Looks like you got it working, LMK if you are still having trouble.

I just changed repository permissions to only allow “squash merging” and to disallow “merge commits”, so there is no confusion in the future.

0reactions
cs01commented, Nov 11, 2019

All relevant PRs have been rebased and merged, closing.

Read more comments on GitHub >

github_iconTop Results From Across the Web

How do I properly force a Git push?
As I detail in my own answer, git push --force is indeed another valid way to force push, and will push branches just...
Read more >
Help! I just force-pushed to master! What do I do now?
Create a branch from that commit, pull the branch from GitHub, then push that commit back onto master .
Read more >
git push --force and how to deal with it—Martian Chronicles ...
Here, all you have to do is to go into your team chat and ask this person to force push their recent changes....
Read more >
How to force push in Git | Learn Version Control with Git
The --force option for git push allows you to override this rule: the commit history on the remote will be forcefully overwritten with...
Read more >
How to Undo a `git push --force`
One of my colleagues recently got in touch with me to say that they'd force pushed to the wrong branch, and needed a...
Read more >

github_iconTop Related Medium Post

No results found

github_iconTop Related StackOverflow Question

No results found

github_iconTroubleshoot Live Code

Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free

github_iconTop Related Reddit Thread

No results found

github_iconTop Related Hackernoon Post

No results found

github_iconTop Related Tweet

No results found

github_iconTop Related Dev.to Post

No results found

github_iconTop Related Hashnode Post

No results found