Skip to content

Conversation

@hamogu
Copy link
Member

@hamogu hamogu commented Dec 29, 2014

This commit follows on a rebase, where I rebased the work of #3102 on the
current master. Thus, this closes #3102 which in turn fixes #3029.

@astronomeralex You did a great job in #3102 and if I had not screwed up the rebase
(I deleted the wrong line in a merge conflict) then my name would not turn up here
at all. I've based this on your branch and github will recognize you are the author
for your commits.
As you may have observed, it is very uncommon in astropy for other people to take ov
and finish a pull request that they did not initiate themselves, but I want to make
sure that this makes it into the 1.0 release as it will be much harder to change the
name of a model once 1.0 is released.

@astronomeralex
Copy link
Contributor

@hamogu -- thanks very much! being on Christmas break has been nice, but I forgot about that rebase. I appreciate you taking care of it. :)

@embray
Copy link
Member

embray commented Dec 29, 2014

@hamogu You can rebase your branch now to remove your mistake :)

Run git rebase -i master and move your commit to between @astronomeralex's and mark it as "fixup". Then it will just vanish entirely and the original commit will be correct again :)

@hamogu
Copy link
Member Author

hamogu commented Dec 29, 2014

Will do.

@hamogu hamogu force-pushed the rename-beta1d-and-beta2d-issue-3029 branch from f164f30 to add6636 Compare December 30, 2014 01:27
@hamogu
Copy link
Member Author

hamogu commented Dec 30, 2014

@embray I did not get it to work with rebase because the order of commits matters and I could not reorder it to make my commit go away.
Instead I have just deleted my branch, I checked out @astronomeralex branch again and did the rebase from scratch, so that should remove any contribution from me from the commit messages as well. I hope I did not overlook anything again.

I let Travis run again just to make sure.

@embray
Copy link
Member

embray commented Dec 30, 2014

Hmmm...usually that works for me, but whatever works. Looks good now, thanks!

embray added a commit that referenced this pull request Dec 30, 2014
Rename beta1d and beta2d - solves issue 3029 (This takes over #3102)
@embray embray merged commit f3a22b9 into astropy:master Dec 30, 2014
@embray embray added this to the v1.0.0 milestone Dec 30, 2014
@hamogu hamogu deleted the rename-beta1d-and-beta2d-issue-3029 branch January 4, 2022 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Rename Beta1D and Beta2D models

3 participants