Shaun Abram
Technology and Leadership Blog
Subscribe to RSS FeedGit Branching Strategies
Some quick notes on different Git Branching strategies.
I am covering the 3 main strategies, and discussing them in increasing order of complexity: GitHub Flow, GitLab Flow and Git Flow.
Tags: branching, git, gitflow, github, githubflow, gitlabflow
Git Notes
These are some git notes I’ve put together over the years. I refer back to these frequently, but there are many better sources for Git docs out there, so use at your own risk!
If you do choose to use, any feedback welcome.
Tags: git
Git revert a merged branch
The article discusses how to revert changes that have already been pushed to your remote git branch, particularly reverting the changes that come from a branch merge.
Tags: git, github, gitpr, gitreset, gitrevert
Git rebase
Git rebase can be intimidating for newcomers, but it’s a powerful and versatile tool when you understand it.
Like git merge, rebase allows you to bring the changes from one branch into another. However instead of all those noisy commit merges you get with the merge command, rebase allows a tidier, linear commit history.
Technically, rebasing is the process of moving a branch to a new base commit, but if that isn’t clear, hopefully the diagrams and explanations below will illuminate.
Before we even start looking at rebase though, we will start with a quick review of merging.
Git talk at SVCC’15
Some short notes from a talk on “Everything you wanted to know about Git…” by Lenny Markus. Slides available here.
Tips:
Use autocomplete
Use the latest git tool, not the apple default
As part of the demo, he used watch to monitor a directory by running a command every few secs.
Covered git init, staging, reset and rebasing.
Live Templates in IntelliJ
As described here, IntelliJ’s live templates let you easily insert predefined code fragments into your source code.
I have posted some of my most used templates below, a link to my complete list of template files on GitHub (as a reference for myself when I setup new IntelliJ environments) and the steps I took to add the IntelliJ settings file to GitHub.
(more…)
Tags: git, github, ide, intellij, productivity, shortcuts, tools
How to add a project to GitHub
Although the GitHub docs contains good info on how to add an existing GitHub project to your local machine, how to add an existing (unversioned) project from your local machine to GitHub was a little less clear to me. Here are the steps I use.
Tags: git, github, intellij, vcs, versioncontrol