Working with Separate Branches

 Lab 4 - Adding Feautures and Working on Separate Git Branches

This week I worked adding and updating features to my CLI url status checker, DeadOrNot. I choose to update my link filtering flags to have my clear option names as all as add a flag for displaying all link information. 

Setting up Separate Branches 

I started out my creating two issues on github repo detailing the changes I was about to make. Then I made branches to match each of those issues. This has actually helped to maintain an orderly work flow as opposed to the more disorganized style of coding I fall into sometimes while working on projects. Having the issues separated in separate branches made it easier to stay focused on a singular task as opposed to trying to work on multiple things at once which is something I tend to do. 

Merging the Branches to Master Branch 

I thought the process of combining my changes to the master branch would be more difficult but the process was relatively simple and that is encouraging moving forward I can try to work in this more organized fashion always. I started by committing my two separate branches (a75a535 , ca77f96). Once I did that I merged the first one to the master branch and then before I merged the second one to the master branch I fixed any conflicting changes. I closed the issues I created with its corresponding link to the commits I made and I was done. 

Final Thoughts

Overall working in this style has helped me learn a way to work that can both help me stay focused on a single task as well as keep me organized.  

Comments

Post a Comment

Popular posts from this blog

Adding Features and Pull Request

Week 3 OSD600 - Pull Requests   This week, our class took a look at each other's release from the previous week and were tasked with finding an issue or suggesting an improvement/adding a feature and then implementing that fix or improvement in the from of a  pull request. This week I decided to once again took a look at Matt's CheckMyLinks python tool.  Finding Issues or Suggesting an Improvement While reviewing Matt's code, I couldn't really find any issues that I could fix, so I instead I decided to look for ways I could think of to improve his tool. I had a couple ideas but the one I decided to go with was to add an option that would allow the user to save the results of the link check to a text file. I thought this would be useful so the user can have a reference of the results after leaving the command line. I left an issue request on Matt's repo and began to implement the improvement.  Implementing Improvement   The first thing I did when star...
Read more

Release 0.4 Progress - Organizing the code

 After taking some time to understand the code that runs the bot, I was able to separate the code out into a few different categories that would be placed into their own files, code that creates the classes that manage the checking of reddit posts and comments, code that manages the bot streaming and posting to reddit, code that initialized the initial state of the bot and code that provides general utility to the bot.  Once I was able to separate out all that logic, the next issue I need to tackle now is how to make the code work while flowing through these different files. Currently since the app operates in one file, the bot creator has been making use of a lot of global variables instead of constantly passing variables through several functions. I dont think this solution is ideal so I currently I am working on a more efficient solution that doesnt involve passing several variables across functions and files. I think perhaps creating a dictionary that contains critical dat...
Read more

OSD600 - Lab 1 - Testing and Reviewing

Networking on Slack The first step in getting by code reviewed and tested was speaking to my peers in our Slack server. At first it was a little intimidating to post my code to be reviewed because I was nervous about being judged however after seeing how helpful my peers could be I was excited to see what they could help me with. And vice versa, I was excited to see what I could help others with. Overall, taking the first step and posting my repo and seeing my peers give feedback was exciting.  Getting Reviewed    My Repo I had a couple people point out issues and provide helpful solutions with my code. First I had Michael Brackett find some grammatical mistakes in my README file as well as provide me useful insight and resources into the differences between the request and urllib modules in python. This allowed to get a second look at my README to make sure there were no mistakes and give me a chance to make a more informed decision on which module to use. Next...
Read more