These are chat archives for AxisCommunications/locomote-video-player

28th
Nov 2014
Alexander Olsson
@noseglid
Nov 28 2014 12:50
@gaetancollaud It almost works. I think you just did a small oversight. I commented in #114 . Also, there was an issue with the gulp-jscs dependency which caused travis to fail. I've updated this on master so it would be cool if you could rebase on master
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:03
Thank you for your comment !
Arggg I struggled so much the last time, I hope It will be ok this time...
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:14
s**t it failed again
can you merge the conflict or should I do like the last time (creating a new branch from your master and redo all my changes) ?
I rebased like you said (git fetch origin, git rebase origin/master, <solve conflicts>)
Now that I pushed my changed, github said that something need to be merged
arrrrg...
I rebase on MY origin, not yours
Alexander Olsson
@noseglid
Nov 28 2014 14:17

@gaetancollaud Do it like this:

git checkout master
git checkout -b destroy_player
git cherry-pick <shaid of destroy commit>
git push -f <your remote> axis_destroy_player

profit

Yea I noticed :)
But push -f is a good way to "reset" your pull request and propose what's in your current branch at the moment.
(master in above snippet is AxisCommunications/locomote#master - not your master)
Also, try and avoid commits that just changes the number of new-lines at the end (such as the one in .gitignore)
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:22
I didn't understant "shaid of destroy commit"
haaaaa
SHA id
^^
I will lose time with cherry-pick, I thing I will redo my changed
I not good enough with git to save time with it ^^
Alexander Olsson
@noseglid
Nov 28 2014 14:25
You can do it anyway you want :smile: If you have a branch which is based on AxisCommuncation's master, then you can force-push it (-f flag) to your branch axis_destroy_player, which will neatly update the current pull request.
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:28
And what should I replace with <your remote> ?
origin ?
Alexander Olsson
@noseglid
Nov 28 2014 14:28
what is your output of git remote -v
Alexander Olsson
@noseglid
Nov 28 2014 14:29
Yea, origin is yours, and upstream is axis. So yes, origin.
That will push your current branch (and forcefully overwrite it) on your remote.
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:30
I cross the finger ^^
Alexander Olsson
@noseglid
Nov 28 2014 14:30
If you do git diff upstream/master
Do you see only your changes with the destroy player?
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:31
hum, It said to me that everything is up to date, but I just commited someting
yep, I see my changes
Alexander Olsson
@noseglid
Nov 28 2014 14:31
And only your changes?
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:31
yep
Alexander Olsson
@noseglid
Nov 28 2014 14:31
weird..
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:31
only the destroy function (and the saved tag to this)
Alexander Olsson
@noseglid
Nov 28 2014 14:32
try git push origin <current local branch>:axis_destroy_player
oh, and -f too
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:32
something happend
Alexander Olsson
@noseglid
Nov 28 2014 14:33
yea, it looks good
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:33
yeepii
^^
I copied by hand so wait a sec, I first want to try
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:41
yep, work for me
the player is correctly destroyed and removed from the dom of the page
Alexander Olsson
@noseglid
Nov 28 2014 14:45
Yep, looks good! Thanks!
Gaétan Collaud
@gaetancollaud
Nov 28 2014 14:57
thank you very much for your help with git
Alexander Olsson
@noseglid
Nov 28 2014 15:05
Sure thing :)