[04:03:34]  Nick change: Benjamin_V`afk -> Benjamin_V
 [05:00:29]  NelleV_ (~Nelle@cuisine.tuttu.info) joined #markus.
 [05:00:34]  NelleV_ (~Nelle@cuisine.tuttu.info) left irc: Changing host
 [05:00:34]  NelleV_ (~Nelle@unaffiliated/nellev) joined #markus.
 [05:01:30]  NelleV (~Nelle@unaffiliated/nellev) left irc: Ping timeout: 260 seconds
 [06:07:34]  Nick change: NelleV_ -> NelleV
 [08:29:09]  jerboaa (sgehwolf@nat/redhat/x-xnprfaftqfzozmdv) joined #markus.
 [09:37:35]  tobioboye_ (2663a5a6@gateway/web/freenode/ip.38.99.165.166) left irc: Ping timeout: 245 seconds
 [10:15:08]  Nick change: xddadacha -> ddadacha
 [10:52:02] <jerboaa>  Benjamin_V, Could you please give MarkUsBot ops? Thanks!
 [11:34:49] <Benjamin_V>  jerboaa: Sure
 [11:35:00]  #markus: mode change '+o jerboaa' by Benjamin_V!~Benjamin_@unaffiliated/benjaminv
 [11:35:10]  #markus: mode change '+o NelleV' by Benjamin_V!~Benjamin_@unaffiliated/benjaminv
 [11:35:15]  #markus: mode change '+o m_conley_away' by Benjamin_V!~Benjamin_@unaffiliated/benjaminv
 [11:35:40] <ddadacha>  Now let's see how long it takes for Nelle to deop herself ;)
 [11:35:48] <Benjamin_V>  ddadacha: eh eh :)
 [11:35:56] <ddadacha>  Benjamin_V: you forgot the bot :P
 [11:36:09] <Benjamin_V>  ddadacha: oh&
 [11:36:12]  #markus: mode change '+o MarkUsBot' by Benjamin_V!~Benjamin_@unaffiliated/benjaminv
 [11:36:13] <Benjamin_V>  \o/
 [11:36:26] <ddadacha>  =)
 [11:40:39]  #markus: mode change '-o NelleV' by NelleV!~Nelle@unaffiliated/nellev
 [11:41:01] <NelleV>  took me long.. I was on coffee break
 [11:42:10] <ddadacha>  you were op for a whole 6 minutes!
 [11:42:22] <Benjamin_V>  NelleV: :]
 [11:43:10] <NelleV>  it was a 6 minutes coffee break I guess :p
 [15:08:49]  Ayaya-Aaron-MBP (~Ayaya-Aar@S010600059a3c7a00.vf.shawcable.net) joined #markus.
 [15:27:37] <Ayaya-Aaron-MBP>  hello
 [17:58:57]  Ayaya-Aaron-MBP (~Ayaya-Aar@S010600059a3c7a00.vf.shawcable.net) left irc: Read error: Connection reset by peer
 [17:59:13]  Ayaya-Aaron-MBP (~Ayaya-Aar@2002:ae01:3559:0:d057:1fb5:6599:ad6c) joined #markus.
 [18:55:52]  Nick change: ddadacha -> xddadacha
 [19:17:44]  Ayaya-Aaron-MBP (~Ayaya-Aar@2002:ae01:3559:0:d057:1fb5:6599:ad6c) left irc: Quit: Ayaya-Aaron-MBP
 [19:18:43]  Ayaya-Aaron-MBP (~Ayaya-Aar@S010600059a3c7a00.vf.shawcable.net) joined #markus.
 [19:42:13]  jerboaa (sgehwolf@nat/redhat/x-xnprfaftqfzozmdv) left irc: Quit: Leaving
 [19:46:36] <Ayaya-Aaron-MBP>  hi anyone here?
 [19:46:59] <Ayaya-Aaron-MBP>  I'm getting this strange error when trying to push to remote repo, something about non-fast-forward..
 [19:47:13] <NelleV>  hi Ayaya-Aaron-MBP
 [19:47:25] <NelleV>  Ayaya-Aaron-MBP: have you rebased ?
 [19:47:31] <Ayaya-Aaron-MBP>  I just did I believe
 [19:48:01] <NelleV>  you probably changed the history in your local repository
 [19:48:19] <NelleV>  basically, git throws this error when the local commits don't match the remote commits
 [19:48:45] <Ayaya-Aaron-MBP>  how would you usually resolve this error?
 [19:48:47] <Ayaya-Aaron-MBP>  try rebasing again?
 [19:48:50] <NelleV>  it can be that someone pushed to the remote repository, and you didn't sync, but if it is to your fork, that means you've changed the history on your local repo
 [19:48:59] <NelleV>  rebasing won't help
 [19:49:22] <NelleV>  that's usually not a good sign (this is why rebase is dangerous. I don't usually recommend using it)
 [19:49:48] <Ayaya-Aaron-MBP>  mm
 [19:49:52] <NelleV>  you can try to force push to your remote repository, but be aware that the changes will be irreversible
 [19:49:58]  Nick change: pranq_ -> pranq
 [19:50:14] <NelleV>  if you lost data in the rebase, you will not be able to revert to previous states
 [19:50:22] <Ayaya-Aaron-MBP>  right
 [19:50:35] <NelleV>  also, as much as possible, you should avoid force pushing to public repository :)
 [19:51:08] <Ayaya-Aaron-MBP>  what would be the best course of action now then? create a new branch and re-apply my changes
 [19:52:13] <NelleV>  it depends how confident you are in the rebase you've done :p
 [19:52:46] <NelleV>  if you are confident you did the job right, and there's no problem with the rebase, you can force push. Else, create a new branch and reapply the changes
 [19:53:09] <Ayaya-Aaron-MBP>  I may have forced skipped a patch or two by accident. :)
 [19:53:21] <Ayaya-Aaron-MBP>  so I think I'll stick to creating a new branch.. :D
 [19:54:05] <NelleV>  ok :)
 [19:54:46] <Ayaya-Aaron-MBP>  thanks! :) oh and I figured out my issue, for some reason the session data wasn't correctly being set to nil when I did it
 [19:56:11] <NelleV>  oh nice
 [19:58:09] <Ayaya-Aaron-MBP>  I am kind of confused that, maybe I am doing the fetch and merge operations wrong
 [19:58:32] <Ayaya-Aaron-MBP>  but when I created a new branch and tried to do 'git push origin issue_298' it gives me the same fast forward error
 [19:58:47] <Ayaya-Aaron-MBP>  issue_298 is the name of the new branch I created
 [19:58:59] <NelleV>  if you are using fetch and merge it should be fine
 [19:59:08] <NelleV>  merge doesn't rebase, so it doesn't change the history
 [19:59:53] <NelleV>  so that is maybe on another branch ?
 [20:00:59] <Ayaya-Aaron-MBP>  if I wanna fetch and merge changes to my branch, am I doing this right: 'git fetch markus-upstream && git merge issue_298
 [20:01:09] <Ayaya-Aaron-MBP>  markus-upstream is the main Markus repo
 [20:01:47] <NelleV>  no, that's not good
 [20:01:52] <NelleV>  in which branch are you ?
 [20:02:06] <Ayaya-Aaron-MBP>  issue_298_revised is the one that I was working on
 [20:02:16] <NelleV>  you should be in the branch you want to merge in
 [20:02:31] <Ayaya-Aaron-MBP>  ok
 [20:02:31] <NelleV>  and to merge the changes from markus-upstream, you need to do git merge markus-upstream/master
 [20:05:35] <Ayaya-Aaron-MBP>  oh ok
 [20:06:31] <Ayaya-Aaron-MBP>  now it says up to date
 [20:06:42] <Ayaya-Aaron-MBP>  but still giving me the error
 [20:06:46] <Ayaya-Aaron-MBP>  when i try to push
 [20:07:18] <Ayaya-Aaron-MBP>  using 'git push origin issue_298_revised
 [20:07:26] <Ayaya-Aaron-MBP>  issue_298_revised being the name of my branch
 [20:12:59] <NelleV>  what error is it giving ?
 [20:14:39] <Ayaya-Aaron-MBP>  nevermind I fixed it!
 [20:14:49] <NelleV>  ok
 [20:14:56] <Ayaya-Aaron-MBP>  I did a "git pull origin branch_name"
 [20:15:11] <Ayaya-Aaron-MBP>  and then I had to resolve a conflict that I had
 [20:15:15] <Ayaya-Aaron-MBP>  and then it let me push!
 [20:15:32] <Ayaya-Aaron-MBP>  I still don't really understand what I did wrong though...
 [20:28:35] <Ayaya-Aaron-MBP>  Anyways, thanks for your help! Time to head off =)
 [20:28:41]  Ayaya-Aaron-MBP (~Ayaya-Aar@S010600059a3c7a00.vf.shawcable.net) left irc: Quit: Ayaya-Aaron-MBP