This is the 4th week of OSD 600. Without a doubt, this 3rd Lab, it's much more simple for me comparing to the previous two labs. Because in this Lab 3, I'm going to work with my own SSG (Static Site Generator) that I made 2 weeks ago. Since I'm going to update my own code, it will saves me a lot of time to go through the logic and add some new features.
Requirement
In this Lab 3, we are going to choose 2 features out of 4 features our professor provided, and the two that I chose were:
Feature #1: Add an optional -l, --lang, and/or \l, which indicates the language to use when generating the lang attribute on the root <html> element.
Feature #2: Add support for a horizontal rule in Markdown. The Markdown --- should get converted to an <hr> tag.
Procedure
Issues
After determining the features I'm going to add. I made up 2 Issues for my features.
Issue #8: Add an optional -l, --lang, and/or \l flag.
Issue #9: Add support for converting Markdown --- to an <hr> tag.
Create Topic Branches
The following step is creating two branches issue-8 and
issue-9 of my issues so that I can work on them separately. And they won't impact each other or the original branch that my SSG located.
Here is the code I used for creating branches:
$ git checkout master
$ git checkout -b issue_#8
$ git checkout -b issue-9
Commit & Merge
And then I updated my code git add and committed them git commit to the specific branch I created. And the last step was merge them to the original(master) branch I have.
Just simply with the code:
$ git checkout master
$ git merge issue-8
$ git merge issue-9
My Feelings
This is a simple lab for me. It doesn't have a lot of requirements and I don't need to work on other people's code which saved me a lot of time to understand the different logic or language. Lab 3 gained me a good experience working on GitHub Merge. I can see why merging on a large scale project can be useful.
Top comments (0)