Zabbix 3 install on Ubuntu 14.04 & adding hosts / items / graphsĭatadog - Monitoring with PagerDuty/HipChat and APMĬontainer Orchestration : Docker Swarm vs Kubernetes vs Apache Mesos Nagios - The industry standard in IT infrastructure monitoring on Ubuntu Nagios on CentOS 7 with Nagios Remote Plugin Executor (NRPE) New Relic APM with NodeJS : simple agent setup on AWS instance Linux - General, shell programming, processes & signals. Samples of Continuous Integration (CI) / Continuous Delivery (CD) - Use casesĪrtifact repository and repository management Sponsor Open Source development activities and free contents for everyone. Git Cheat sheet - quick command reference.Git/GitHub via SourceTree IV : Git Reset.Git/GitHub via SourceTree III : Git Work Flow.Git/GitHub via SourceTree II : Branching & Merging.Git/GitHub via SourceTree I : Commit & Push.Setting up a remote repository / pushing local project and cloning the remote repo.GIT on Ubuntu and OS X - Focused on Branching.Undoing Things : File Checkout & Unstaging.One page express tutorial for GIT and GitHub.Select "Start a new Hotfix" after pressing "Git Flow":įrom Git Flow, select "Finish": Git/GitHub Tutorial
#Sourcetree git flow hotfix update
Once we've made our 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 we need to patch the latest release without picking up new features from the development branch, we can create a hotfix branch from the latest master branch (which is the latest deployed code). We can make more commits to it during our preparation for release, and when it's ready to be deployed we merge it back into both the development branch, and the master branch (to indicate it's deployed). When we're about to package a new release, we create a release branch from the development branch. Later on, we'll merge this back into the development branch to queue it for the next release.
When we start work on anything non-trivial, we create a feature branch. Only updated by merging other branches into it. This branch represents the latest released / deployed codebase. This is our main development branch where all the changes destined for the next release are placed, either by committing directly for small changes, or by merging other branches (e.g. The general idea is that we use the following branches in our repository:
0 kommentar(er)
