-
Notifications
You must be signed in to change notification settings - Fork 31
Home
nietky edited this page Oct 15, 2012
·
8 revisions
Welcome to the mtpy wiki!
- Introduction to using git remote branches
- See git branch history
- A successful Git branching model
- Using "rebase" is a nicer way of keeping work on one of your unpublished branches up to date with master : http://softwareswirl.blogspot.com.au/2009/04/truce-in-merge-vs-rebase-war.html
- Resolving merge conflicts
- Installing Meld (merge resolution tool) on Windows (.gitconfig setup tip)