greptilian logo

IRC log for #sourcefu, 2015-08-09

http://sourcefu.com

| Channels | #sourcefu index | Today | | Search | Google Search | Plain-Text | plain, newest first | summary

All times shown according to UTC.

Time S Nick Message
02:08 pdurbin sivoais: cool. how is it?
02:15 sivoais pdurbin: I'm reading some of their  back issues (which are free)
02:15 sivoais this "Gonzo Engineering" series is interesting <https://pragprog.com/magazines/2013-01/launching-a-gonzo-engineering-project>
02:16 sivoais It's written by Steven K. Roberts. He crossed the US on a bike outfitted with computers. A "technonomad"
02:29 pdurbin hmm, I had an old boss who talked about gonzo this and that. I'll have to check that out
04:51 fhackdroid joined #sourcefu
06:25 fhackdroid joined #sourcefu
13:49 aditsu pdurbin: hi there
13:50 aditsu a little help with github please... how do I update my fork with the changes from your project?
14:22 pdurbin aditsu: hi. this is the "easy" way, I guess: https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/
14:22 pdurbin but
14:22 pdurbin if I were you I would set up a "remote" called "upstream" like this: https://help.github.com/articles/configuring-a-remote-for-a-fork/
14:23 pdurbin and then merge "upstream" into your fork like this: https://help.github.com/articles/syncing-a-fork/
14:28 aditsu pdurbin: oh, I can't do it through the web interface?
14:33 fhackdroid joined #sourcefu
14:55 fhackdroid joined #sourcefu
15:09 sivoais aditsu: I don't think so. I've never seen a way to do that. Plus that is too low level. What if there are merge conflicts? :-)
15:10 aditsu if there are any changes in my fork (even with no conflict), it should fail and give me a message
15:17 pdurbin aditsu: if you want, just push to your fork (without trying to pull the latest from upstream) and I'll try to merge it in
15:18 aditsu I don't have anything to push at the moment :p
15:18 pdurbin oh
15:20 pdurbin aditsu: you *could* delete your fork in the web interface and re-fork
15:21 aditsu eww
15:29 pdurbin heh
15:43 fhackdroid which control system are you guys using?
15:55 pdurbin fhackdroid: control system?
15:55 aditsu mercurial ftw!
17:06 fhackdroid pdurbin, revision control system :P
17:06 fhackdroid why mercurial ? :P
17:07 pdurbin I use git.
17:12 fhackdroid pdurbin, even i use git
17:13 pdurbin I'm happy enough with it.
19:07 fhackdroid joined #sourcefu
19:48 aditsu fhackdroid: because it's the best
19:49 fhackdroid hahaha i doubt that aditsu
19:49 fhackdroid :P

| Channels | #sourcefu index | Today | | Search | Google Search | Plain-Text | plain, newest first | summary

http://sourcefu.com