[00:18:11] *** Quits: JuanDaugherty (~juan@98.4.124.117) (Quit: Ex Chat)
[01:49:04] *** Joins: stoopkid__ (uid137696@gateway/web/irccloud.com/x-xpohalqepeouvynl)
[08:27:41] *** Quits: proteusguy (~proteus-g@184.22.240.66) (Remote host closed the connection)
[08:50:23] *** Joins: proteusguy (~proteus-g@180.183.121.36)
[11:06:50] <inariksit> mbrock: thanks! I tried the git reset --hard origin/basque , but it still says "this branch is 18 commits ahead of master"
[11:06:56] <inariksit> (18th is yet another merge)
[11:07:35] <inariksit> I can just delete that branch and start another one, it doesn't really matter to me :-P but I suspect that's kinda like this https://xkcd.com/1597/
[11:40:11] *** Quits: proteusguy (~proteus-g@180.183.121.36) (Remote host closed the connection)
[11:41:57] <mbrock> inariksit: ahh, maybe it's because your local copy of `origin/basque` isn't updated since you did the merging on GitHub.com -- so try the same but after `git fetch`
[11:44:48] <mbrock> also, the next time you want to push this branch to GitHub, you'll need `--force` (`-f`) because of the reset
[11:56:50] <inariksit> okay, so I did git fetch and git reset --hard origin/basque
[11:56:57] <inariksit> do I push now?
[12:21:05] *** Joins: koom (~sirdancea@109.107.211.244)
[13:49:35] *** Joins: venicecat (caa61422@gateway/web/freenode/ip.202.166.20.34)
[14:01:44] <vin-ivar> wait, can i make pull requests with resource grammars now? :D
[14:02:14] <inariksit> vin-ivar: yes!
[14:02:41] <vin-ivar> sweeeet
[14:03:08] <vin-ivar> my contributions graph is gonna be so green
[14:04:11] <vin-ivar> Flammie, i might come to finmt
[14:04:23] <vin-ivar> i heard ondřej bojar was going to be there
[14:25:48] <Flammie> yea
[14:26:35] *** Quits: venicecat (caa61422@gateway/web/freenode/ip.202.166.20.34) (Ping timeout: 260 seconds)
[14:27:45] *** Quits: stoopkid__ (uid137696@gateway/web/irccloud.com/x-xpohalqepeouvynl) (Quit: Connection closed for inactivity)
[16:07:54] *** Joins: proteusguy (~proteus-g@184.22.251.90)
[16:56:13] *** Joins: proteus-guy (~proteus-g@2405:9800:bc10:1ca:68a4:351:5bca:b9a3)
[16:59:33] *** Quits: proteusguy (~proteus-g@184.22.251.90) (Ping timeout: 240 seconds)
[17:39:56] *** Joins: venicecat (caa61422@gateway/web/freenode/ip.202.166.20.34)
[18:34:42] *** Quits: daherb_ (~daherb@cse-principia.cse.chalmers.se) (Ping timeout: 260 seconds)
[18:36:15] *** Joins: daherb (~daherb@cse-principia.cse.chalmers.se)
[19:48:00] *** Quits: venicecat (caa61422@gateway/web/freenode/ip.202.166.20.34) (Ping timeout: 260 seconds)
[21:34:21] *** Joins: stoopkid__ (uid137696@gateway/web/irccloud.com/x-ymkiduxluuvctguo)
[23:53:04] *** Quits: stoopkid__ (uid137696@gateway/web/irccloud.com/x-ymkiduxluuvctguo) (Quit: Connection closed for inactivity)