Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. This gave us an incredible way to keep the code consistent, easily explain to your peers what is wrong with their code or approach and at the end lower the number of bugs present in the application. One or more work items must be associated with the pull request.All code review comments must be resolved. The project has to build with no errors.Be approved by one or multiple team members.With a few settings on Azure DevOps, we can set multiple criteria for a pull request to be approved. Once a feature is considered done the developer has to create a pull request asking his feature to be merged to the develop branch. Pull Request & Azure DevOps to the rescueĪs mentioned in the previous point. Azure DevOps offer a smart and very user-friendly way to remedy that challenge and it was a huge success using this feature during our last project. It can be hard to find a tool to review commits correctly or easily provide feedback on the developer’s code you are reviewing. Dev branch will receive only approved code (more stable, less potential bugs)Įven as a small company, we struggle to find the right process to perform code reviews.Dev can easily relate their feature (pull request ) with bugs, tasks, and stories.Corrupted commits don’t affect other team members.It forces the project to be split into little features.Their pull request then has to be reviewed and approved by the project lead, or another member of the team. Once a feature is considered done, the developer has to create a pull request to merge their feature into the develop branch. All work related to the feature they are working on will be done there. Each developer is required to create a feature branch off the develop branch. With Git Flow branching strategy and some settings on Dev Ops no commits can be done directly on the develop branch. What features are being worked on and by who. Unit Tests can’t be done on dev because the feature isn’t completed yet. Which sometimes ends with stressful and complete chaos for a short (sometimes long) period time on the entire team. A new coder on the team can break the project branch with one wrong commit and affect all other members. Having multiple developers working on the same projects isn’t always easy especially when you try to not step on each other’s feet. This is a summary of what we tried to achieve and why we think these tools combined have helped us in many areas including collaboration, git concept learning curve, code quality, code consistency, and code stability. Merging and Resolving Conflicts using GitKrakenĬhallenges and problems we tried to resolve.Setting Branch Policies and Pull Request.Initialize Git Flow branches from GitKraken.Why git is called a distributed source control system?.Pull Request & Azure DevOps to the rescue.Challenges and problems we tried to resolve.****Note: GitKraken has a free desktop version but for this tutorial, we are using the pro version which includes Azure DevOps integration. Each concept can be used separately but for us, those tools combined gave us a nice and smooth experience. In this article, I will summarize our approach using these tools including the git client GitKraken which implements the GitFlow workflow approach. One of the biggest changes was the switch from TFS to Git for our code repository and Microsoft Azure DevOps for project and task management. Microsoft Teams, Azure DevOps, Office 365). For Example, as a Microsoft Gold Partner, we are primarily using Microsoft Products for collaboration and project management (i.e. We decided to experiment with our workflow to try and resolve recurring issues from other projects and use the maximum potential of the tools and products available to us. In 2019 we had the opportunity to start a project from scratch for a new customer.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |