These are chat archives for astropy/astropy

12th
May 2016
Ole Streicher
@olebole
May 12 2016 00:21
@astrofrog @bsipocz - for some reason I get rebase conflicts then which have nothing to do with the PR.
Brigitta Sipocz
@bsipocz
May 12 2016 16:20
@olebole - you mean rebasing to a bugfix branch? I tried to do that today, and realized it was a bad idea as the rebasing wanted to bring all the commits differing from the bigfix branch. So at the end used cherry-pick to bring only the relevant commits. The is also a script somewhere doing the backports, but I don't know which one it is.
@MSeifert04 - not sure, I haven't had the chance to play with it much.
Ole Streicher
@olebole
May 12 2016 17:13
@bsipocz -how do I do the cherrypick within the current PR?
Thomas Robitaille
@astrofrog
May 12 2016 18:49
@eteq - are you around?
Michael Seifert
@MSeifert04
May 12 2016 19:51
@astrofrog What would be the best approach to fix wrong changelog entries of already merged PRs? Your 2 comments made me reread the changelog entries and I might have forgotten some of them and one is factually wrong. Could be a longish list. :smile:
Thomas Robitaille
@astrofrog
May 12 2016 21:47
@MSeifert04 - best approach is just to open a new PR with all the fixes you want to make
Michael Seifert
@MSeifert04
May 12 2016 23:07
@astrofrog would it be ok to include them in #4876 or as standalone PR?
Thomas Robitaille
@astrofrog
May 12 2016 23:07
@MSeifert04 - it's fine to include them in #4876 since they are related to NDData
Michael Seifert
@MSeifert04
May 12 2016 23:08
thank you