mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-23 07:38:20 -05:00

Table of Contents

Notes On Git Rebase

Rebase and squash commits. Once you've handled code review feedback on a pull request or branch, squash commits down to a minimum number of meaningful commits. Merge feature branches into master. Read this article for pros and cons of merge or rebase policies.
Follow good Git commit message practices. These are listed below. Source.
Separate subject from body with a blank line
Limit the subject line to 50 characters
Capitalize the subject line
Do not end the subject line with a period
Use the imperative mood in the subject line
Wrap the body at 72 characters
Use the body to explain what and why vs. how

Notes On Git Rebase

Set up your text editor beforehand. This process involves git opening up a text editor, and if you're not familiar with emacs or vim you might have trouble. If you're on Mac, you can run in the terminal git config --global core.editor open. This will tell git to open up TextEdit by default during interactive rebases and any other time git needs you to edit a file for input. open may be substituted with atom, subl, vim, etc depending on your editor of choice, if you have the corresponding command set up.