DEV Community

Artem Tanyhin
Artem Tanyhin

Posted on

SSGo 0.3 and notorious git merges

Hi again! Glad you've come. First of all...

It's update time! 🎉

SSGo is at release 0.3, which means some additional Markdown features!

  • Markdown Horizontal rules --- are now turned into <hr> HTML tag.

  • Markdown inline code blocks are now turned into HTML <code> tags.

  • Some code optimizations to prepare for adding italics and bold text! Hoping to add soon...

If you're not familiar with SSGo, you can check it out in my GitHub repo. It's under MIT license, so contributions are more than welcome.

Git merges

This time, I worked on both Markdown features in parallel on separate branches, which meant I had to merge those eventually.

Merging code is something many programmers prefer not to do. They still have to, but don't enjoy it as much. However, for me it's different.

I actually like git merges more than I probably should, and I usually do some optimizations in the process too. For me, coming up with an optimization and getting pieces of software together is just so relaxing. You know the code is done, so all you have to do is get it together, like a jigsaw puzzle.

Anyway... Like anything in open source, I started by assigning issues (10, 11) that I assigned to myself. After that I started working on separate branches on my local. After both have been done, I fast-forwarded the first branch to master, and made a merge from the second branch to master.

There is a charm in doing everything properly, and not making a mess out of your repo.

Top comments (0)