Git on Camping Coder

git stash and pop

Thu, 26 Apr 2018 00:00:00 -0500

Sometimes you’re in such a rush to write code that you forget to switch branches and only realize later that oops… wrong branch! What do you do then? Some might even be tempted to copy their code elsewhere, switch branches and then copy it back. Well, there’s a better, more graceful way called stash and pop that comes into play. Not only do they give you a way to temporarily store your code on a branch, but they let you move it to other branches as well.

How to use git flow

Thu, 05 Apr 2018 00:00:00 -0500

git flow is among one of my favorite ways to teach git, and frankly one of my favorite ways to use git. It’s a pattern to follow and one of the best parts about git flow is that it makes automation on top of git very simple. Additionally, most of the graphical user interfaces already have it built in, so you can’t lose.

What is it really?

git flow is nothing except a git branching model. If you already read git branches simply explained and git Merges Demystified in our git series, then you have all the tools needed to start using git flow. Initially published by Vincent Driessen, the git flow model has been a welcomed pattern for git branching and from there the tie ins to it have been just flowing.

Scheduling code deployment with Bitbucket

Thu, 15 Mar 2018 00:00:00 -0500

Having a deployment pipeline is an awesome thing, it eliminates the mundane task of deploying changes. Really let’s face it, if a task is boring or mundane, then there’s likely a chance where a mistake could happen. Sometime though there’s a need to re-deploy, or at least deploy code at a certain time, and that’s where an overlooked feature in Bitbucket pipeline comes in which is simply called Schedules.

Schedule button

git Merges Demystified

Thu, 01 Mar 2018 01:00:00 -0500

Last time in our git series, we looked into branching and merging - setting the ground work for how to merge code when your working by yourself. While that is all well and good, the real power is in collaborating with a team. In this post, we discuss the dreaded merge conflict, what they are, and how to resolve them.

Setting the stage

To explain a merge conflict, it is easier to tell the story of two developers - in out case Dev A and Dev B. They are both awesome developers and always branch from the right branch, check in their code, and write great commit messages. They have both been assigned to different features on our project.

git branches simply explained

Thu, 22 Feb 2018 01:00:00 -0500

So far in our git series, we’ve taken a look at all the steps needed to start using git to track and store your code. We haven’t looked into one of the most powerful parts of git which is branches. Branches solves the problem where you might be working on X at the moment, but Y needs attention now. Branches additionally help when working with other people on projects. For example, when I first started writing code this seemed so easy and my steps usually included something like:

Automated code deployment with Bitbucket and Docker

Thu, 11 Jan 2018 00:00:00 -0500

You’ve probably heard of Docker, but don’t have the time needed to learn or implement it - you probably also want to start automating your builds, because who likes to deploy code? In this post, we’ll cover using Docker to deploy code using Bitbucket Pipelines. It will be high level on what docker is and enough to either use someone else’s Docker image or build your own - without needing to install Docker on your machine. We will then use that image to deploy our projects source code using Bitbucket Pipelines.

What's a remote in git

Thu, 04 Jan 2018 00:00:00 -0500

git logo

In the last installment of the Learning git series we took a look at how to start using git to version code. Now that we know how to commit our code, we need to know how to share it, or at least back it up. This is where the remote command comes into play with git.

In general, a remote is literally a remote from your current machine. You can set it up a few different ways, but I’ll cover the central repository pattern here. With that pattern you can think of a remote as just a big cloud data store -it’s more than that, but let’s move on for now.

Initializing git

Thu, 28 Dec 2017 00:00:00 -0500

git logo

Thus far in our Learning git series, we talked about an awful lot of theory and configuration, but haven’t actually used git for what git does. In this post we are going to discuss what we need to do in order to start tracking files with git. Additionally, we will review the scope of git on your files as well.

Like everything in the git-verse there’s more than one way to start using it. We will first look at a few graphical user interfaces, and then move onto the command line. For most folks the user interface is the route to go while learning git, but the command line really is easy too - it just take a little more when you’re learning.

Setting up git

Thu, 21 Dec 2017 05:00:00 -0500

git logo

In the last two post in our Learning git series, we talked about why to use git and the basic pattern you’ll find yourself using most often. In this post we are going to walk through the steps needed to get git setup and functioning on both Windows and Chrome OS. It’s becoming easier and easier to do this, and hopefully this guide will get you on the right path.

The git cycle

Thu, 07 Dec 2017 05:00:00 -0500

git logo

I like rocket ships - one of the best things about living where we do in Florida is that we get to watch the launches from our front porch. So I got to thinking, is git like a rocket ship? I busted out the doodling pad and realized yes it is - even more like one of the new reusable rockets, but that’s aside the point.

Intro to git - Part 1

Thu, 30 Nov 2017 05:00:00 -0500

git logo

I’ve been using git for quite a few years now for version control on my software projects. It’s pretty popular and easy to use but I continue to meet programmers who have tried it but just can’t seem to grasp it. While it’s sad to see a colleague struggling with something, it’s worst when you have them ’learning’ on a live project - no one has fun there. I’ve been lucky enough to have presented sessions on git in the past at Orlando .Net Code Camp, and figured that having a series of posts breaking down those sessions could have some value.