These are chat archives for coala/coala-bears

3rd
Feb 2019
John Vandenberg
@jayvdb
Feb 03 05:30
Naveen Naidu
@Naveenaidu
Feb 03 05:31
PLease have a look at https://travis-ci.org/Naveenaidu/coala-bears. I guess @sladyn98 did not rebase his commits on top of the others. Have a look here, this shows that if all the three changes are combined then the Travis goes green
Naveen Naidu
@Naveenaidu
Feb 03 05:36
@sladyn98 Please rebase your commits on top of the other two commits, that way we can finally test it
John Vandenberg
@jayvdb
Feb 03 07:17
im not looking elsewhere. you need to organise your PRs so one of them is green, and they are all correctly stacked on top of each other
Sladyn
@sladyn98
Feb 03 07:21
Yeah @jayvdb we are working on it, you will see a green CI soon :)
Amol Grover
@frextrite
Feb 03 08:56
@sladyn98 what's the rebase status?
John Vandenberg
@jayvdb
Feb 03 10:36
it was done badly
Amol Grover
@frextrite
Feb 03 11:24
Should I try the rebase?
I've already done the rebase offline(I hope it is proper)
Naveen Naidu
@Naveenaidu
Feb 03 11:39
@frextrite Please help @sladyn98 out with the rebase. That would be a better way. Else it would only be replication of work
Amol Grover
@frextrite
Feb 03 12:03
I tried the rebase. Apart from replication of work, if I rebase my branch with @sladyn98's commit, it would rewrite both our commits, and create new ones. If sladyn does the rebase, his own commit would be written over but ours would remain as it is.
Take a look at this coala/coala-bears#2850
I'll revert the above rebase though.
Man, this tool is powerful XD
Naveen Naidu
@Naveenaidu
Feb 03 12:07

it would rewrite both our commits, and create new ones.

Can you please explain what you mean by this.

Amol Grover
@frextrite
Feb 03 12:09
Image the green one to be my branch that contains both our commits and the blue one to be sladyn's branch
Naveen Naidu
@Naveenaidu
Feb 03 12:14
Gotcha!Understood. I completely forgot that you had already rebased your commit over mine.
Sladyn
@sladyn98
Feb 03 13:27
So do you want me to do the rebase again?
Amol Grover
@frextrite
Feb 03 13:34
Yep
Please use reset_rebase_test branch for rebasing. It contains both mine and @Naveenaidu's commits.
Sladyn
@sladyn98
Feb 03 14:13
Yeah @frextrite woking on learning git rebase --onto a very powrerful command indeed.