Perl 6 - the future is here, just unevenly distributed

IRC log for #webwork, 2012-02-25

| Channels | #webwork index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
03:47 aubreyja joined #webwork
03:47 aubreyja joined #webwork
19:13 aubreyja joined #webwork
19:13 aubreyja joined #webwork
19:30 mgage_ hi all
19:53 aubreyja Hi
19:55 mgage_ I put up a new version of webwork2 on my github account and sent you a pull request.  I'm beginning to get the hang of git
19:56 aubreyja great - I'll pull it
19:57 mgage_ actually maybe not -- it went out to arnie and david -- I'll send it again
19:59 mgage_ nope -- I did send it.  It has the hide/show stuff from arnie and work on the library browser. I'm about to divide up global.conf so it's easier to maintain.
20:00 aubreyja I do have one - it says - "this pull request cannot be automatically merged" does that mean there are conflicts?
20:01 mgage_ could be -- there were probably two waiting for you.  The first one might have trouble merging -- I was still struggling using git and it had some conflicts
20:01 mgage_ the second one should be smoother after the first one
20:02 aubreyja ok, does it just mean I have to do it locally and process conflicts as in svn?
20:03 mgage_ you can fetch them to your laptop machine and then merge them into a branch off your master and then -- once that is all resolved -- merge the result back into your master.  You won't be using github tools (just git on your local server)
20:03 mgage_ there will probably be fewer conflicts than with svn
20:03 aubreyja and I've only got one pull request from you
20:03 aubreyja did you send the second one today?
20:04 mgage_ the message has two parts -- Is ent the second one last night -- it may have overwritten the one I sent last week
20:06 mgage_ probably the simplest thing is to add   github/mgage as a remote on your laptop and fetch directly from my github repository there.   -- if you are using a mac I've found the pictures drawn by SourceTree to be very enlightening -- I don't think it was free but it didn't cost that much.
20:13 aubreyja ok, I've added your repo as a remote, if I now fetch it, will it fetch it into a branch, or do I need to explicitly fetch it into a branch?
20:15 mgage_ it will fetch into a new branch -- but just to be sure I have been creating a test branch before i try anything  e.g.     git branch  master;    git checkout -b test_branch;   git fetch mgage/master;
20:16 mgage_ I turned the google+ hangout on as long as I'm sitting here coding.
20:17 mgage_ sorry that first one should be git checkout master -- so that you create the test branch off the master branch
20:18 mgage_ not sure if you get an email about it -- but you should see the hnagout invite in your google+ stream
20:36 aubreyja ok, I think I did that right. I think the github mac app messed up my ssh keys, but it looks like I properly merged your pull request
20:44 mgage_ that's happened to me a couple of times -- I'm typing in my login and password -- I haven't yet taken the time to reset the ssh keys (some of this might be because I am not always using the same computer).
20:45 mgage_ Did you see the nangout invite?  if you download google+ app for your ipad you can join from there
20:45 mgage_ or your iphone
21:17 aubreyja sorry - back - I got a pull request to merge a new couch into our tv room and some new groceries into our kitchen :)
21:24 mgage_ me too -- as to the groceries -- Sandy just got back from the store
22:54 mgage_ headley pinsent sent a note to rt -- she can't get through the captcha on the wiki

| Channels | #webwork index | Today | | Search | Google Search | Plain-Text | summary