DEV Community: Dheyson Alves

How to integrate Git Flow in your team?

Dheyson Alves — Mon, 08 Feb 2021 10:34:41 +0000

Introduction

GitFlow is an abstract idea for managing branches using Git. It helps how branches should be created, and how to merge them. On windows, the base installation of Git comes with the command git-flow, which allows determining the flow in the repository. His only difference to git init is that he creates and delimits names for specific branches. On OSX systems, it can be installed via brew, with the brew install git-flow command.

Our team was in need to start defining some git branches patterns. I brought the idea to the table to implement the git-flow process. The people on our teams was increasing, so we would need more coordination in working together with many developers on the same project.

We should work together to implement for future process automation.

How does it work?

I am going to explain each part of the process. Explaining how all the parts fit together. Just to a point to consider here, this pattern, it's just a conventional, you might find a better way to your team, so, you can break the rules!

Main and Develop branches

The combination of the two branches allows you to maintain a version history. The main is the production branch, and where version tags are launched. Develop is a branch of integration with features, it is created from main, and all the next features are merged into it.

Feature Branches

A feature branch is created from the last develop, and when it is finished, it is merged back into the develop and deleted. Feature branches never interact directly with the main.

Release Branches

When develop branch is ready to go for approval, a release branch is created from it. In the release branch created, bug fixes, documentation, improvements, any requests in tests performed by QA are carried out. After finalized and tested, it is merged with main and develop, creating a new version tag on main and then deleted.

Hotfix Branches

The hotfix branch is for solving errors occurred in production, it is created directly from the main, as soon as it is solved, it is merged into main and develop (or release if it is still active). Also adding a new version tag to main.

Recap

The general git-flow follows below:

develop branch is created from the main;
release branch is created from develop;
feature branches are created from develop;
When a release is completed, it is merged with develop;
When the release is complete, it is merged with develop and main
If a problem in the main is detected, a branch called hotfix is created from the main;
Once the hotfix is completed, it is merged with develop and main

How was implementing in the company?

There was a need for more branches organization in the company. There were multiple branches that had no meaning, already was merged, but was still there. Many developers worked on the project and started to create branch as a big branch stair, one over another, of course, that leads to conflicts, which was not good, but at least they were solved safely.

So I call my team and started talking about a way to fix these issues. I spoke about git-flow, wrote a small article, like this one here, explaining how and then we publish in company documentation guidelines repository. The team started to follow, in some small projects, and its quite working.

Your whole team must agree about the way you all discuss, to suit all your projects needs.

But other discussions come to the table, automation, git-flow was a big start, the next step we gonna work on CD/CI in some repositories processes.

Hope you liked the article, feel free to share and comment. Accept any critics about it. ✨

This article was originaly published in Dheyson Alves - Blog 📝

5 Essential Visual Studio Code Extensions for Collaborative Work

Dheyson Alves — Sat, 28 Mar 2020 17:08:47 +0000

Code editing. Redefined.

This is the slogan for the Visual Studio Code home page. In my journey, through IDE’s and text editors, none of them changed my conception of what a complete and integrated environment can be. Either by the immensity of extensions made available by the community and by Microsoft, or by its compact and robust design. Visual Studio Code, even in the market for such a short time, 2015, managed to attract a large number of developers looking for an inviting and simple solution.

About extensions, the editor would not be complete without them. Here are 5 extensions and a few bonuses that might help you or your team in their daily lives.

Live Share

The tool seeks to bring a collaborative environment in real-time to edit or debug code in Visual Code. Working with a classmate or co-worker remotely, whether, in pair-programming, code review or to solve a company-specific problem is no longer an issue. You are wrong if you believe that it is just that, it is not a simple remote editor. You can also, chat with your coworkers, share your server and local terminal! That's right, in addition, you can even invite more than one person to work collectively.

The extension comes with a package: Live Share, Live Share Audio, Live Share Chat and Peacock. That together brings this incredible tool for remote work.

Git Lens

I knew it that was spending too much time at the terminal to carry out the commands to add, commit and push. It was when I realized that needed a tool to automate this process, and on the road, learn more information about the history of my commits. Git Lens welcomed me and gave me the power of Git Supercharged, great insights into code changes, a file and line history, and several other tools. Certainly, if you need to move forward with using git and need more data on the progress of your codebase, this is an essential tool.

Live Share Whiteboard

Didn't you already understand some concept or explanation, and your teacher or mentor needed to leave Visual Code to draw on another tool? The purpose of the extension is precisely this, to have a collaborative 'Whiteboard' within Visual Code, exactly. You can now design relational database models, software architecture, or even make a presentation to your team and friends.

Jira and Bitbucket

Atlassian created its own extension for Visual Code Studio. In this tool, you can access the Issues and Pull Request of Jira and Bitbucket. In addition, through it, you can even create your own issues, pull requests, do code review among other activities.

Code Stream

Code reviewing is made easier with CodeStream, it allows you to add code comments from any member of your team and forward directly to Slack and Bitbucket. You can even discuss blocks of code with your team, leave questions or comments in markup format.

Honorable mentions

Todo Tree

Create TODO or FIXME tags in your code to assist other developers with what needs to be done with Highlight.

Settings Sync

Synchronize all your Visual Studio Code settings, extensions, editor settings, colours, snippets, everything you need in the cloud.

Do you have any to share?

These are the ones I know, tools that help me a lot in remote work or in everyday productivity. If you know any, leave a comment below or Send a Tweet.

PS:

If you wanna see our original post, check it out Thanks!

Static or dynamic website?

Dheyson Alves — Mon, 29 Jul 2019 19:34:08 +0000

Hey,
I was about to start a podcasting blog with Gatsby, react and graphQL with markdown data. I have made some research about static and dynamic websites. And also the JAMSTACK arquitecture.
I asked some friends, they was fast to answer "dynamic". But after read about new technologies with JAMSTACK arquitecture, I asked myself if a static webpage could handle it or not.
Could anyone help me with that?

Thank you