**** BEGIN LOGGING AT Sun Nov 08 02:59:58 2015
Nov 08 10:39:36 <frite> http://lpaste.net/144862
Nov 08 10:39:48 <frite> ^ should i abort or cannot work anyway?
Nov 08 10:40:08 <frite> And how long does a buil take, i started it before i wen to sleeap 9 hour bsago and it is still building...
Nov 08 10:40:38 <frite> it doesnt write anything to the prompt so i have no idea if it is working or if it gets stuck
Nov 08 10:47:30 <frite> noone?
Nov 08 12:00:55 <frite> http://lpaste.net/144875
Nov 08 13:02:33 <frite> I worked on branch B that is behind master (A) and now I want to branch from B to C and merge master into C
Nov 08 13:13:08 <JEEB> [on B] -> [git checkout -b C (if C is a new branch you're creating)] -> [git merge/rebase master (usually when you have your own branch(es) you rebase them on top of master to always have your own work on top of the branch you're basing on)]
Nov 08 13:13:50 <JEEB> in both cases if there's stuff that both you and the other side changed you will have to do merge conflict resolution
Nov 08 21:18:30 <neverpanic> seebs: sent, let me know if you have any questions
Nov 08 21:18:38 <seebs> Thanks!
**** ENDING LOGGING AT Mon Nov 09 02:59:59 2015