DEV Community

Add00
Add00

Posted on

Parallel Branches in Git

Greetings,

In this weeks assignment we went deeper into the abilities of git. Covering feature branches and how to properly merge them into main. Using our existing AI powered CLI tool.

For this assignment we had to make 2 new features and develop them in 2 different branches. I opted to add output streaming and folder handling.

The process for streaming was quite simple as I already had the functionality when outputting to stdout. I then added a flag to toggle this functionality. With the default behavior to show a loading spinner.

The process for handling folders was a bit more complex as it required me to develop a recursive function that could find all of the files and files within sub folders as well. Finding the files in the root directory was simple enough, and with the help of a friend I managed to not overflow the stack when calling the function.

We followed proper git procedure when adding these features. As mentioned previously they were on separate branches. Folder support was added first followed by Streaming being merged in.

Through out this process I learned quite a bit about recursive functions and git merges, and I look forwards to what I'll learn next!

Top comments (0)