Ashley Drake

Software Engineer

[email protected]

Twitter Github

Posts

Git Rebase Tricks: Rebase Interactive

I have been using the git rebase command heavily lately, and thought it might be good to write a quick tips and tricks guide about it. I have found it incredibly useful for keeping my git history clean, organizing my thoughts about what I am writing and why, and grouping changes together as logical groups. Why would I want to use this? First, it might be useful to motivate why this tool is helpful. Read more...

Git Folder Structure and Naming Conventions

Recently at work, I ran into one of those once-in-a-while git issues that generally end up being solved with creative Googling and git magic. This time, though, I wanted to understand a little more about how git works. The problem I was developing a new feature with a colleague, so we had two branches going that we were rebasing against each other as we went. feature-name/my-branch feature-name/his-branch At some point, we decided it was time to merge our branches into one consolidated effort. Read more...
1 of 1