DEV Community

Cover image for Adding features to existing code & merging the branches
Japneet Singh
Japneet Singh

Posted on

Adding features to existing code & merging the branches

Introduction

I have been working with open source development for four weeks now. It has been a great pleasure to work with GitHub. After completing pull requests to other developers. Now, I am moving forward to learn to merge changes from different branches. Here's my Swift development code Repo

Creating issues

First of all, I created the issues to provide information on what changes are to take place. So, I commenced with the feature to support Add an optional -l, --lang, or \l flag feature.Also, issues such as Add support for a horizontal rule in Markdown and Add support for inline blocks in generated html pages

Merging and Pushing

First Commit

The process was trickier than I thought. I created another branch for this issue to avoid changes on the main. The code part was not hard. I was able to do it quickly. I had issues because I forgot to git add and git commit the files before merging. This created problems which were resolved later on and pushed them to the main branch. d7244e14

Second Commit

This commit took place firmly, was able to do it without any error and made changes to a different branch. Added and committed from that other branch and then merged onto the main branch. The features were to support MD files to have inline blocks and horizontal rules generated to HTML pages.
e59061b

Conclusion

I learnt a lot of things during lab 03, I can now work on different projects and can clone the project to my local computer. This will help me to work on my files. Also, not to forget to segregate the branches based on each issue found. In the end, merging the code and testing before creating merge requests to other developers. In future, I would like to work slowly and do not push to the main branch until successfully tested lol.

Top comments (0)