These are chat archives for astropy/astropy
bsipoczhave you already made changes, or want to start from a fresh branch?
git remote -vshow?
git checkout -b add_whatsnew upstream/master
bsipoczthat will create a new branch originating at the top of the current astropy master
bsipoczand you should be good to go
bsipoczohh, what does
git statussay? I assume you don't have any uncommitted changes hanging around, right?
bsipoczyes, add your commits, then
git push kelle add_whatsnew
bsipoczwhen you go either your fork or the astropy/astropy repo, github will recognize the freshly pushed branch, and automatically offer the option to open a PR
bsipoczif you have some modified files, they sometimes create conflicts when you change branches
bsipoczyou don't need to refer to the issue in the commit message, when merging we'll have the PR number there anyway
git fetch --all? What's the workflow I should follow each time to get my local and fork up-to-date? or if I do a fresh branch each time, it doesnt matter?
bsipoczWell, doing a
git fetch upstreamshould be enough, but I prefer to sync all the remotes I have, too.
bsipoczThis only makes your remotes up-to-date, but then you can start up new branches off those remotes.
bsipocze.g. we usually suggest to get rid of the master branch of the fork, so there is no confusion when it goes off sync off locally from upstream/master
bsipocz(though thinking about it, probably it's not yet put back to the astropy contribution docs)
bsipoczalso, while I love the command line in general, something it's nice to have a git gui to visualize all the branches out there