These are chat archives for DmitryEfimenko/ForRebaseDiscussion

18th
Sep 2015
Dmitry A. Efimenko
@DmitryEfimenko
Sep 18 2015 15:30
hey, hope it's ok that I pulled you in.
I did rebase --abort and tryed again. Here is one weird thing that happens: when I type git rebase -i HEAD~7 it actually gives me a lot of entries:
pick 01b12ce fix(infinite-scroll): load more data if needed pick 7e024e4 fix(infinite-scroll): load more data if needed pick 783434d fix(infinite-scroll): load more data if needed pick 341a561 fix(infinite-scroll): load more data if needed pick 3eca46e feat(core): add sortDirectionCycle column option pick c228b97 Fix bug: expectRowCount will get doubled row count if there is pinned columns pick a549eaa fix(Header): Use IE9 condcom to fix header sizing pick 4122186 chore(docs) Create a list of third party features pick 880ce19 fix(selection): reset selectedCount on clearSelectedRows If your data is completely replaced by another array, then you need to call clearSelectedRows and it wasn't resetting the selectionCount pick a7da8d3 fix(infinite-scroll): load more data if needed pick 01ab52f fix(infinite-scroll): load more data if needed
sorry, here in better format
pick 01b12ce fix(infinite-scroll): load more data if needed
pick 7e024e4 fix(infinite-scroll): load more data if needed
pick 783434d fix(infinite-scroll): load more data if needed
pick 341a561 fix(infinite-scroll): load more data if needed
pick 3eca46e feat(core): add sortDirectionCycle column option
pick c228b97 Fix bug: expectRowCount will get doubled row count if there is pinned columns
pick a549eaa fix(Header): Use IE9 condcom to fix header sizing
pick 4122186 chore(docs) Create a list of third party features
pick 880ce19 fix(selection): reset selectedCount on clearSelectedRows If your data is completely replaced by another array, then you need to call clearSelectedRows and it wasn't resetting the selectionCount
pick a7da8d3 fix(infinite-scroll): load more data if needed
pick 01ab52f fix(infinite-scroll): load more data if needed
so I go through them and delete all that aren't my commits. Is that right thing to do?
Yonatan Kra
@YonatanKra
Sep 18 2015 17:56
that's really strange - I'm on a holiday, so can't put much time into it. In any event, the ~7 should have made sure you would have only 7 rows (commits) to pick and squash...
but yea, try to delete what you don't need, and change the relevant picks to squash and see if that works for you
Dmitry A. Efimenko
@DmitryEfimenko
Sep 18 2015 17:57
all right, have a good holiday then. Thanks for help!
Dmitry A. Efimenko
@DmitryEfimenko
Sep 18 2015 18:54
hey, just in case you are interested, I deleted the first commit from the list that it was complaining about (01b12ce) and it worked. Thanks again!