Week 4
Git/Github Adventure
1. Collaborating on a Shared Project A First Git Team Exercise
I did a Git activity in class, I found that it was useful and I was able to finish it in the given time. I think I was only able to finish it because I already have some experience with Git/Github. Of course, there were some merge conflicts. For example, three people were trying to push their repositories at the same time. I wanted to solve this issue using the given instructions to request an updated repository from other teammates using the Pull command before the Push command. However, there was another issue with that. I forgot what the exact error message was, however, I was able to solve it. I Googled the problem and found a solution from StackOverflow.
Overall, I enjoyed the class and in doing so I learned how to use Git/Github. I am currently working on a group project, but none of us are experts in using them. We were discussing ways in which we can avoid merge conflicts and decided to use Branch a couple of weeks ago without understanding what it really is and how it works. So, I was glad to not only read the Pro Git book but also put my new knowledge into practice through participating in the collaboration activity.
2. Reading A Beginner’s Very Bumpy Journey Through The World of Open Source
The author’s advice to fellow beginning developers who want to contribute to open source:
- Tip #1: Don’t be afraid to ask questions
- Tip #2: It’s OK to have holes in your knowledge
- Tip #3: Just start
Those three tips really helped me release my nervousness before putting my step on the open source community. I was afraid of being involved in projects, and I had discouraged myself from participating due to my lack of both coding and English skills.
3. What I Edited To a Classmate’s Blog Post
Suppose that I have been asked to review the blog post of a user named Shakespeare:
Fork
a copy of Shakespeare’s repository- Clone this
fork
to my local machine (git clone [url]
) - Make any changes I think are necessary to the blog post in my cloned copy
- When I think that a particular change is good and complete, stage it using the
git add
command (git add -A
), and commit the staged change with a good commit message, using thegit commit
command (git commit -m “changed this and that thing”
) - Push my changes to my remote using the
git push
command - Ready to issue a pull request
I followed the instructions from Collaborative Editing: Improving Your Peers’ Blogs like above, which was easier than described through Collaboration Workflow Presentation. I didn’t encounter any merge conflicts. I guess I was the only one who tried to push some changes into the master branch, so there was no need to request a pull before my push. I should’ve created a branch and checked it out before requesting a pull according to the slide(Collaboration Workflow Presentation), but it seemed to work fine without it.
Opening an Issue | Pull Request | |
---|---|---|
Toby | LinkdIn/Github icons on the bottom of the blog Clicked the Linkedin and Github icons on the bottom of your blog, but they don’t work properly |
Changes to _config.yml |
Ariella | 1. README.md How about remove the default message and write something new following the instruction? 2. Blog for week 13 December 4, 2019, hasn’t come yet. How about hiding this post by adding ‘_’ in front of the default file name 2019-12-04-week13.md? |
Changes to blog post for week 13 and README.md |
Amal | Blog for week 13 December 4, 2019, hasn’t come yet. How about hiding this post by adding ‘_’ in front of the default file name 2019-12-04-week13.md? |
Changes to blog post for week 13 |
4. What I Have Done This Week
- Collaborated with others on a Shared Project
- Read articles A Beginner’s Very Bumpy Journy Through The World of Open Source, 7 Things That Make a Great open Source Contributions and How to Contribute to Open Source
- Read the Blog Editing Activity which contains the detailed instruction for how I should edit my classmates’ blogs, Collaboration Workflow Presentation and Instructions for This GitHub Workflow Activity
- Read chapters Git Basics and Git Branching from the Pro Git book
- Continued to edit OpenStreetMap