Category Archives: #git

My first conflict

So today I was doing some more documentation on the eutester repo. Everything was going fine until I went to push my changes to the repo. To my surprise, I received a conflict. Confused, i went to the github page to see if anyone had made changes to the file i was commenting. Sure enough, Marcos had made some additions to the comments. I tried to figure out how to fix the conflicts manually in my code but finally just decided to do a fresh clone of the repo and remove my old one. I normally do pulls before I get started on changing anything, I guess I just forgot to today and ran into a conflict because of it. At least I learned a little more about git due to this mistake, which is always good!

From the blog clacroix12 by clacroix12 and used with permission of the author. All other rights reserved by the author.

More Python

While things with infrastructure were being dealt with, I decided to jump on the eutester documentation project. So, during class I cloned the repo that kwurst forked and got to it. I took some time throughout the week to go through multiple directories in the eutester code and try to understand how it all worked and connected. I’m still not sure how everything works, but I do have a much better understanding of the code.

As far as documentation goes, I did do some in the eucaweb directory. The files i added to were the euwebaccount.py and euwebgroup.py. These are fairly basic scripts that setup accounts and groups respectively for testing purposes. Once I was done with commenting those for the day, i committed and pushed my changes to the repo. I checked the github page just to make sure and seeing my first push ever was pretty cool!

It looks like a few of us are doing good on commenting the code, so I wouldn’t be surprised if we had this project done within the next week. Now that I have a better understanding of the code I will be able to get some more commits in before the semester is over.

From the blog clacroix12 by clacroix12 and used with permission of the author. All other rights reserved by the author.

Meeting 4: Getting to know Git

So in this meeting, the class and I will be getting to know more about Git, which is a version control system for a project, more can be read on its official website git-scm.com or github.com, a website devoted entirely to Git. So first off, I have to have Git on my system, which is an Ubuntu OS. 3 ways to get Git: downloading from its site, using the command: apt-get install git-core, or using the software center. There was also an exercise that we got to do to set up Git, edit personal info, and played with a repository. It was my first time experiencing Git so there was some confusions in me but it was a good start. At least I know some basics through the exercise. So I’m going to go through the tutorial on the Git website to get a better understanding of the system.

From the blog longnguyen16 » wsu-cs by watever10 and used with permission of the author. All other rights reserved by the author.

All about git

Last week’s class was, for reasons that were made quite obvious, all about git. Just from the examples and small bit of experience we got with this tool in class, I can already tell that it will be extremely valuable for the remainder of the course, and my career as a computer scientist. Version control is a new topic to myself and going over the functionality of git made it fairly straight forward. It will take a little bit to get used to the commands to use git efficiently, but that goes without saying.

I actually think it would be a good idea to have CS students learn about git much earlier in their college careers and put it to practice in group coding assignments. This would provide students with a work environment for a project similar to the real world, long before they actually get there.

From the blog clacroix12 by clacroix12 and used with permission of the author. All other rights reserved by the author.