In the last post, I talked about how to create a Git repository and upload it to GitHub. In this post, I'm going to talk about how to resolve Git conflicts.
First, we're going to create a Git Repository for the user Doug. Since I already covered that in the last post, I'm bring to breeze through those steps below:
$ mkdir doug $ cd doug $ git init Initialized empty Git repository in /path/to/doug/.git/ $ touch README.md $ git add README.md $ git commit -m "First commit" [master (root-commit) d86a7e2] First commit 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 README.md
At this point, we have a repository created for the user Doug. Now I'm going to clone that repository for the user Andrew:
$ cd .. $ git clone doug andrew $ ls -l total 0 drwxr-xr-x 4 doug staff 136 Nov 28 16:59 andrew drwxr-xr-x 4 doug staff 136 Nov 28 16:47 doug
In this post, I'm going to discuss how to create a GitHub repo and upload (or "push") it to GitHub, a popular service for hosting Git repositories.
The concept of revision control is a system which tracks changes to files. In programming, that is usually program code, but documents and text files can also be tracked. Using revision control will give the following benefits:
In GitHub, we store revisions in "repositories" or "repos" for short. As of this writing, the #1 service for storing Git repositories is GitHub. They offer free hosting for Git repositories.
Make sure you have a copy of Git. If in doubt, go to the official Git website and download a copy.
Here are my duty hours:
Thursday: 1:30 PM to 4 PM
Friday: 4 PM to 7 PM
Saturday: 4 PM to 8 PM
Sunday: 4 PM to 8 PM
Outside of those hours, I look forward to hanging out with friends, flailing around at the dances, and generally having fun. I'll see you there!
Another fun year at FurFright! FurFright was held October 25th-27th, 2013 at the Crowne Plaza hotel in Cromwell, CT.
Once again, I worked security, and during the off hours I got to socialize with friends, and make a few new ones.
I didn't get to see as much of the con as I'd like, since I had some really whacky shifts. (Midnight to 4 AM, then a 4 AM to 8 AM shift)
Interested in the Go Programming language? I will be presenting a web crawler which I wrote in Google Go on Wednesday, November 13th, 2013 at DramaFever's offices in Narberth, PA. More information about the meetup can be found on meetup.com.
For those curious about my web crawler or would like to check out the source, the source is up on GitHub.
Finally, for anyone who is curious, here is a sequence diagram of how my web crawler works:
I hope to see everyone there!
On the weekend of November 9th and 10th, 2013 I had the pleasure of participating at PilotPhilly. PilotPhilly was a 24 hour hackathon for high school students. While I am not a high school student, I am a software engineer and the event put out the call for engineers to help out at the event as mentors. As a mentor, my job was to provide guidance to participants and give them suggestions if they became stuck on a problem.
The hackathon ran from 1 PM on Saturday to 1 PM on Sunday. Sunday afternoon, every group presented their projects. Some projects were serious, some not so serious, and some were downright hysterical.
Here's how to view it:
git clone email@example.com:dmuth/nodejs-presentations.git open seq.html # On a Mac, this will open in your browser
Enjoy, and feel free to send me any questions you may have about Seq!
I attended tonight's Philly DevOps Meetup at the Comcast Center in Philadelphia, PA. As a service to the tech community, I decided to share the notes I took from the presentations.
Earlier this month I attended BronyCon, a convention for "bronies", or people who are fans of "My Little Pony: Friendship is Magic". With over 8,000 attendees, it is the biggest convention of its kind.
No, I do not identify as a brony. I've seen the show, and it's good animation and solid storytelling. If I had children, I'd watch the show. But I do not feel enough of a connection at this time to self-identify as a brony.
A few reasons. First, I was curious about the brony fandom, especially its explosive growth--BronyCon is only 3 years old, and they had over 8,000 attendees this year. Second, I wanted to work a convention outside of my comfort zone for a change. Third... we kinda had a staff swap going. At Anthrocon last month, BronyCon's Operations Director worked for me in my department. So I returned the favor and worked for BronyCon this year.
Yep, I worked for the VIP Relations team, or VIPR for short. One difference between BronyCon and other kinds of conventions I worked is the larger number of guests who are voice actors and relatively famous in real life. Due to the increased attention that guests would get, each guest had a "handler" assigned to them for the duration of the convention. That means your schedule is your guest's schedule. You meet your guest in the hotel when they head out in the morning, and you're on duty until they head back to their hotel for the night. You are responsible for escorting them to each panel and stage appearance on time, and are basically their Point of Contact for the convention itself.
We had another amazing year at Anthrocon 2013 in Pittsburgh!
Let's start with some statistics:
My primary responsibility at Anthrocon is to manage The Operation Office, known more informally as "Con Ops". Among other customer service-oriented functions, we also handled Lost and Found and Volunteers. This year, we tried splitting those tasks off into their own areas. Lost and Found was headed up by Jasper Blue, while Volunteer Coordination was run by Kasi Frost.
Both of these ideas worked out really well. Jasper kept track of all lost and found items in a spreadsheet and was able to more effectively assist people who came by Con Ops looking for lost items. (You'd be surprised how many cell phones are lost each year...) On the volunteer side of things, Kasi came up with some new ideas for managing volunteers, and was able to capture detailed data on how many volunteer hours were put in on each day of the convention, and in what departments. It will help us plan volunteer requirements better in future years.
I stepped things up a bit on the social media side this year and that investment paid off quite well. I tried a few new things for the first time:
1) Many many tweets. I used HootSuite to manage our social media accounts. In addition to just posting, I scheduled 60+ posts to be sent out on Twitter, Facebook, and Google Plus over the course of the convention announcing major events, Guest of Honor panels, and announcements for the Fursuit Parade. Since it can take 30-45 minutes to get to Hall A from The Westin due to elevators, I set up HootSuite to start tweeting announcements about the parade early Saturday morning, and increased the frequency of the tweets and posts through the 1:50 PM "door closing" time. I'd like to think that helped increase turnout at the parade.
2) Customer Service. Since my iPhone can be set up as an Internet access point, I did so and then used my iPad to watch the various social media sites. When a concern about Anthrocon came up, I was able to address it in near real-time. For example, there was a miscommunication between about water bottles being allowed in the Dealers Room and attendees with them were turned away at the door. As soon as I saw it mentioned on Twitter, I was able to relay it to our Security Chief who then let the rest of people on security know that personal water bottles were allowed. Total time to resolve: 10 minutes. I was able to address other issues and answer questions during the convention in this manner as well.