Overview
This week's task was to implement two features for the existing product, for me it is izyum, which is my ssg tool.
Issues
I decided to implement following feature:
- Support converting markdown line to html horizontal line hr - https://github.com/Myrfion/izyum/issues/13
- Add support for inline code blocks - https://github.com/Myrfion/izyum/issues/14
Development
The development of the first feature didn't take a lot of time, it was just basically the condition which checked if line had three or more dash symbols and replaced it with hr html tag.
The second feature implementation wasn't complicated too, just a regex which found markdown code symbols and replaced them with html code tags.
Merging
The merge process of the first branch was smooth. After all, it didn't have any merge conflicts with the main branch because it was up to date with the main branch. https://github.com/Myrfion/izyum/commit/5ddf36f47e5a0873677e8f9de91d8d04400f8b22
Merging of the second branch was more complicated, because of conflics in index.ts and readme.md files, so I had to resolve these conflics. VS Code has pretty good tooling for merging conflicts resolving, so it wasn't complicated to do so.
https://github.com/Myrfion/izyum/commit/52f68f49e48e4d3a14f1c8c7ea8a28fc5d350d15
Conclusions
Resolving merge conflicts is always a pain, but the practice I see helps to reduce this pain to keep your branch as up-to-date as possible.
Top comments (0)