These are chat archives for JnRouvignac/AutoRefactor

21st
Oct 2016
Luis Cruz
@luiscruz
Oct 21 2016 14:54
Hi!
I’m finally back :sweat_smile:
I’ve started doing pull requests, but I have a problem
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 14:55
hey welcome back!
Luis Cruz
@luiscruz
Oct 21 2016 14:55
All the other rules depend upon a helper mthod I’ve created while developing the first rule
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 14:56
Can you send me a URL to it in your github repo?
Luis Cruz
@luiscruz
Oct 21 2016 14:56
yea
It’s the method I’ve extracted
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 14:59
hum
well include it in all PRs
first one in wins
you'll then have to rebase because you'll have conflicts
other idea:
just submit a PR with this single change
I review and approve it fast
Luis Cruz
@luiscruz
Oct 21 2016 15:00
the second idea sounds good
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 15:00
then all other PRs become independent again
Luis Cruz
@luiscruz
Oct 21 2016 15:00
I’ll do it now
can I include .DS_STORE in gitignore for this PR?
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 15:02
yes
Luis Cruz
@luiscruz
Oct 21 2016 15:07
done
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 15:09
ok, I am new to reviewing stuff via github, so please bear with me :)
Luis Cruz
@luiscruz
Oct 21 2016 15:09
no worries :)
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 15:17
review done
I'll wait for a new iteration
Luis Cruz
@luiscruz
Oct 21 2016 15:20
alright ;) working on that
Luis Cruz
@luiscruz
Oct 21 2016 15:40
In the view I was using I havent seen the squash request. I’ll do that now
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 15:46
ok
I just noticed I had a PR from somebody I never head of \o/
Luis Cruz
@luiscruz
Oct 21 2016 15:57
hehe
Apparently Github is down (at least is not working in my faculty)
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 16:00
worksforme
Luis Cruz
@luiscruz
Oct 21 2016 16:00
I’m waiting for it to recover and I’ll push a squashed version
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 16:00
ok, you may need to rebase on my latest master too
Luis Cruz
@luiscruz
Oct 21 2016 16:01
it might be something here
ok, no worries
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 16:01
got to go collect the kids now
chat to you on Monday
Luis Cruz
@luiscruz
Oct 21 2016 16:01
okok
have a good weekend ;)
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 16:02
thanks you too
Luis Cruz
@luiscruz
Oct 21 2016 16:44

just to update you before I leave:

  • I’ve squashed based on upstream/master (your master)
  • I’ve tried to push it to my remote origin, but had to pull it first. This means that I have now a new commit — merge — that appears in the pull request. is this an issue?

On Monday, let me know if this works for you.

Also, I’ve seen that Github provides a feature in wich you can accept PRs and automatically squash them. Is there a reason for not using it?
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 17:03
Yes the merge commit is an issue for le
merci
Damn autocomplete
for me
I have just noticed the automatic rebase and squash
I did not know it could do it
Luis Cruz
@luiscruz
Oct 21 2016 18:57
Ok, I'll figure out how to fix the merge issue
Jean-Noël Rouvignac
@JnRouvignac
Oct 21 2016 19:18
Just look at the history to see what went wrong
I suspect a git pull ended up creating a merge commit on your local master
Luis Cruz
@luiscruz
Oct 21 2016 19:21
Yes, it was a git pull. But I could not push it before doing a git pull. I'll figure it out after dinner (in1hour)