These are chat archives for astropy/astropy
coord-offset. The interactive rebase command will bring up an editor, with two commits in it (as the other 3 are merge commits by other people and those are recognized to be in astropy/master already). In this instance you don't need to any edits, leave the two commit. It's OK to have more than one commit in a PR if those are related to the PR.
% git remote -v origin https://github.com/dmopalmer/astropy.git (fetch) origin https://github.com/dmopalmer/astropy.git (push) upstream https://github.com/astropy/astropy.git (fetch) upstream https://github.com/astropy/astropy.git (push) % git status On branch coord_offset Your branch is up-to-date with 'origin/coord_offset'. nothing to commit, working tree clean % git fetch --all Fetching origin Fetching upstream % git rebase -i astropy/master fatal: Needed a single revision invalid upstream astropy/master
git rebase -i upstream/master
git rebase upstream/master
% git rebase -i upstream/master error: could not apply e0fb553... Offsets working. When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort". Could not apply e0fb553e05f19c8231dedbbb2bb8e903d36e54a8... Offsets working.
adamginsburg on Freenodehey, anyone here have experience dealing with loading shapely & getting the error "OSError: Could not find lib c or load any of its variants ." ? I'm trying to run astropy-regions tests and getting stuck there
% git status interactive rebase in progress; onto 2b3bf33 Last command done (1 command done): pick e0fb553 Offsets working. Next commands to do (2 remaining commands): pick aba360e Restrict `SkyCoord.offset_by` to merely be `SkyCoord.directional_offset_by(posang,sep)` And give notes on how to do more elaborate offsets. pick 662649c Fixing lack of newline on last line. (use "git rebase --edit-todo" to view and edit) You are currently rebasing branch 'coord_offset' on '2b3bf33'. (fix conflicts and then run "git rebase --continue") (use "git rebase --skip" to skip this patch) (use "git rebase --abort" to check out the original branch) Unmerged paths: (use "git reset HEAD <file>..." to unstage) (use "git add <file>..." to mark resolution) both modified: astropy/coordinates/angle_utilities.py both modified: astropy/coordinates/sky_coordinate.py both modified: astropy/coordinates/tests/test_sky_coord.py no changes added to commit (use "git add" and/or "git commit -a")
too many commits rebase --> conflicts fix conflicts --> commit rebase continues --> now there is the squashed commit and the conflict-xied commit too many conflicts: return to start.
def offset_by()for that.
git reset HEAD~6 git stash save temp git rebase upstream/master git cherry-pick 1dabe88cd14a2eb4486d26b5b29df4213e5a3005 git stash pop
% git status On branch coord_offset Your branch is up-to-date with 'origin/coord_offset'. nothing to commit, working tree clean