Tag: git

terminal

oh-my-zsh or how to improve your Terminal

        Filed under: Git

As developers, we spent most of our time on the Terminal, and some of us prefer to run everything from it instead of access cPanels or Administration screens to handle our sites (MySQL client to manage the MySQL server, WP-CLI for WP, Drush for Drupal, you name it!) The problem with those of us who like to … Continued

Tagged: , , ,

Benefits of tagging releases in your git repository

        Filed under: Agile development, DevOps, Git, Web Development

Creating tags for every project release is an additional piece of documentation that can be extremely helpful in certain cases. These  are some benefits: It helps you keep track of the version number of your project, and refer to that release number when talking with other members of the team. It allows you to document … Continued

Tagged: , , ,

DevOps

The importance of hotfix and release candidate branches in the Git workflow

        Filed under: Agile development, DevOps, Git

In government contracts, staging and production servers are usually managed by a different team, which is very challenging when your code works well in development servers but doesn’t work properly in those other servers – you basically don’t have control nor visibility over what is happening behind scenes. In those scenarios, it is really important … Continued

Tagged: , , , ,

Git best practices with pull requests

        Filed under: Agile development, Web Development

Some time ago I published an article about git best practices in agile projects, which prevent the most common conflicts when many developers are collaborating together in a project, especially when they work remotely. That workflow is enhanced by a feature offered by systems like GitHub and BitBucket called pull requests, which allows developers to … Continued

Tagged: , , ,


How to Setup a New Git Repository

        Filed under: How to

Git is a popular version control system for tracking changes in computer files and coordinating work on those files among multiple people. Every Git directory on every computer is a full-fledged repository with complete history and full version tracking abilities, independent of network access or a central server. This article contains the very basic steps to … Continued

Tagged: , , , ,

Git best practices for Agile projects and distributed teams

        Filed under: Agile development, Web Development

For those who are not familiar with Git, it’s one of the most popular version control systems, created by Linus Torvals for the development of the Linux kernel. One of the best features of Git is that every directory on every computer is a full-fledged repository with complete history and full version tracking abilities, independent of … Continued

Tagged: , , , , ,

Git best practices: Commands to create and merge main and supporting branches

        Filed under: Agile development, How to

I recently published an article about Git standards to prevent code conflicts. Down below are all the Git commands you need to know to follow those standards. This is highly recommended when you collaborate with other teams that are not in your company, or when your team is not always collocated. We use those standards daily, and they … Continued

Tagged: , , , , ,

Git best practices: How to minimize code conflicts

        Filed under: How to

Code conflicts suck, any developer knows how painful it is to pull changes from a Git repository just to discover that she will need to invest another hour working on solving conflicts caused by the work of another developer in the same file. Probably, she will end doing a pair review with the other developer to ensure that … Continued

Tagged: , , , ,