While Github Desktop is relatively straight forward, there is some features with weak documentation. With a lingering fear of screwing up a repository or branch for a large company, we felt it would be best to simplify the explanation of some key features. (Work In Progress Article)

Update From Master

If you are currently on “Development Branch A”, and you select “Update From Master”. Your development branch, will re-sync with the master branch, and place your commits on top of your branch. The Master branch remains untouched.

Rebase From Branch

Despite some concerning warnings, this simple pulls the current version from a different branch, and updates you version to match. If you have any unchanged commits, this will then be stashed to help merge afterwards. There is some potential catches to this process. I recommend only using this feature if you are solo working on a branch. Otherwise seek a deeper understanding into what rebasing a branch does.

More To Come