Using GitHub on a Pair Programming Project

When my journey to learn software development began I envisioned sitting alone in my mom's basement in the dark. The truth is, I had no idea how much teamwork and pair programming would be involved in my new career. As someone who loves collaborating I love working with teams. I am a firm believer that two heads are always better than one. 

Now here comes the "but".... 


Work Hug GIF By Kochstrasse™


I knew very little about collaborating on Github as I embarked on my first pair programming project. Here's what I wish I knew:

Getting Started 

Create your repo a.k.a. repository in Github 

    1 > Settings
    2 > Collaborators
    3 > Add People
        

Get the Github desktop app

    You might be thinking "oh jeez, I don't want to install yet another app" but I promise it will make your life easier. 

Add your repository to Github desktop



Open your code editor to update your code

You'll automatically be on the main (or master) branch. You can find your current branch in the bottom left corner of VS Code. 

Be careful on this branch! 



Back in Github desktop you can see your changes

> Add a summary and description. 

> Commit to main


> Push origin
 


Working on a Branch

Create a new branch 



Publish branch 



Edit branch 



Commit changes and Create Pull Request



You will be re-directed to Github to merge your changes (if you wish). 

Or, you can stash them for later if you have functionality you are not yet ready to merge with the main branch. 

On your repository you will find a section header for Pull requests. 

Now comes the fun part. Work with your teammate to decide if you will have responsibility to merge your changes or if your teammate wants to be able to review your changes before merging with the main branch. It's up to you to decide as a team! No matter how you divvy up responsibilities on your next pair programming project I sure hope you have fun doing it now that you know how easy it is to 

 > create a new branch
 > commit changes
 > stash changes
 > merge your changes
... and repeat! 




Comments

Post a Comment

Popular posts from this blog

Importing Excel Data into a Ruby on Rails Application

Image
So you've got some Excel data you would like to import into your Ruby on Rails project?  As a software engineer you may not be responsible for data integrity and quality control. You're given a spreadsheet and your job is to import it and render the information into a web application. But what if you are given bad data? A little bit of basic quality control can go a long way in saving you from future bugs in your application. You can save yourself some time and trouble just by taking a quick peak at your data before importing it.  Paw Patrol Puppy GIF By WesternCPE Ok, now that you have ensured your data is valid and well-structured let's get it into our database! First, set up your application and your MVC (models, views, controllers) in your CLI (command line interface).     1 rails new my_app     2 rails generate resource Product product_title description price:integer (insert          the...
Read more

Planning for the Final Journey (even my plans have plans!)

Image
I've likened my experience throughout my Flatiron School Software Engineering bootcamp to being stranded alone on Mars (like astronaut Mark Watney in The Martian) . You solve one problem, and then you are faced with the next.   While that analogy may seem a little grim to some, there is so much beauty as I look out on the horizon here at the end of my journey. The landscape is rich in color and everywhere I look I see possibility. Just like Mark Watney I have worked hard to solve each problem I have been faced with in my attempt to survive alone on Mars (a.k.a. to finish this program). As I approached the finish line and created a plan for my Flatiron School Phase 5 project I realized I wanted to share some tools and tips that have helped me bring everything I have learned in this program into one final project.  My main goals for this project were:  To continue with my analogies of how coding is a lot like solving problems in The Martian...  Adding CSS styling ...
Read more