![]() You can commit trivial changes directly to the development branch (‘develop’) if you like, but any time you start on something non-trivial you should explicitly start a new feature. Next up, we’ll concentrate on the actions we can perform with Git-flow and SourceTree. For more details please see the Help section included in SourceTree. ![]() You’ll probably just want to use the defaults in the initialisation window so that’s not covered here. If you haven’t used git-flow already on this repository, the first thing SourceTree will do is initialise your repository to use it. You can always get to all the other git-flow actions via this button as well, but most of the time the default option will be the action you’ll want SourceTree to perform. If you’re already on a feature branch, it will offer to finish your current feature and merge it back into the development branch, and so on. If you’re on the development branch, it will default to starting a new feature. So if you haven’t set up git-flow on this repo yet, it’ll help you do that by default. There’s a handy new addition to the toolbar in SourceTree 1.5 (keyboard shortcut Cmd-Alt-F):īased on the current state of the repository, the Git-flow button will bring up a dialog with the most likely action you’d want to perform next. SourceTree helps you utilise these branches via git-flow actions which we will describe below. Once you’ve made your changes, the hotfix branch is then merged back into both the master branch (to update the released version) and the development branch (to make sure the fixes go into the next release too) ![]() If you need to patch the latest release without picking up new features from the development branch, you can create a hotfix branch from the latest deployed code in master.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |