Carol Willing

There exists documentation outside of the guide that addresses this topic: https://www.pypa.io/en/latest/specifications/#

I would be willing to write a documentation page about using conda-forge and PyPI together. It would focus more on the things available than promoting one over the other.

Folks, feel free to add notes in this Hackmd pad: https://hackmd.io/@Y6xjRiXFRUmwV7lDeM-5nQ/SkvWiBfzB

Completely up to you @pradyunsg. Feedback welcome. It may be best at some point to split the PR up too.

I'm inclined to have things that are more specific and perhaps not yet universal recommendations into the scientific computing doc page.

@pradyunsg I will split out into two more WIP PRs.

@pradyunsg Sorry about dropping the ball on this one. I have given you push access to my branch. Feel free to take over any open packaging PRs of mine. Thanks!

@gpshead Here's the workflow that I typically use with git and GitHub (It's the second part of your referenced link - though I'll add a bit more commentary here). I'm...

> Was my git pull in the middle the mistake there? Probably, it did a merge. Personally, I rarely `git pull` unless it is set either globally to rebase or...

FYI... `--force` only needs to be used if you are modifying the branch history. If you are rebasing your branch to the HEAD of upstream/master, then frequently the `--force` option...