recently force pushed to master
See original GitHub issueJust 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:
- Created 4 years ago
- Comments:9 (5 by maintainers)
Top GitHub Comments
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.
All relevant PRs have been rebased and merged, closing.