Zotonic
Zotonic
zotonic@conference.zotonic.com
Tuesday, 17 December 2013< ^ >
Arjan has set the subject to: Zotonic - The Erlang Web Framework & CMS
Room Configuration

GMT+1
[00:17:00] Mawuli leaves the room
[00:17:48] Mawuli joins the room
[00:46:01] arjan leaves the room
[01:06:26] cillian.deroiste leaves the room
[02:59:01] Steffen Hanikel leaves the room
[07:28:30] Mawuli leaves the room
[07:29:49] Mawuli joins the room
[07:45:15] Mawuli leaves the room
[07:45:57] arjan joins the room
[07:46:00] Mawuli joins the room
[08:04:11] Maas joins the room
[08:06:06] Maas leaves the room
[08:19:11] arjan leaves the room
[08:46:39] arjan joins the room
[09:13:46] Kaos leaves the room
[09:24:21] Steffen Hanikel joins the room
[10:06:55] Mawuli leaves the room
[10:06:58] maas.maarten.zeeman joins the room
[10:12:28] Mawuli joins the room
[10:30:15] Mawuli leaves the room
[10:32:04] Mawuli joins the room
[11:01:13] Mawuli leaves the room
[11:03:49] Mawuli joins the room
[12:49:47] Mawuli leaves the room
[16:26:18] Steffen Hanikel leaves the room
[16:40:52] arjan leaves the room
[17:42:44] maas.maarten.zeeman leaves the room
[17:45:57] arjan joins the room
[17:57:42] arjan leaves the room
[18:00:19] arjan joins the room
[18:01:41] arjan leaves the room
[19:44:31] arjan joins the room
[20:05:09] Maas joins the room
[20:06:10] Maas leaves the room
[20:07:42] Mawuli joins the room
[20:08:18] Maas joins the room
[20:26:18] Mawuli leaves the room
[20:27:42] Mawuli joins the room
[21:17:16] <Maas> I have a git question. I have a local repository, with two remotes. Now, I made a couple of incompatible changes in my local master, and want to make the master branch of one of the remotes my new master.. I’ve tried git checkout -f remote/master, but then the local repository goes into detached head state. git merge -s theirs doesn’t exist anymore…
[21:58:04] <arjan> maas: you can just delete your local master branch
[21:58:08] <arjan> if you are sure :p
[21:58:14] <arjan> git branch -D master
[21:58:26] <arjan> and then to checkout a new master from your remote:
[21:58:32] <arjan> git checkout -b master myremote/master
[21:58:49] <Maas> yes that is what I want.
[21:58:53] <Maas> thanks.
[21:59:27] <Maas> I should have made a topic branch.
[22:01:11] <Maas> A nice side effect is that that master brach tracks the other remote.
[22:11:51] <Maas> Hmm, that was not really what I wanted :-/
[22:13:03] arjan leaves the room
[23:33:04] arjan joins the room
[23:34:27] Maas leaves the room
[23:43:38] Maas joins the room
[23:59:42] Maas leaves the room
Powered by ejabberd Powered by Erlang Valid XHTML 1.0 Transitional Valid CSS!