Skip to main content

I had given a talk in the PHP Developers Nepal meetup #14 in Aug 2014 about Rabbit Mq and Symfony. This time the meetup took place at Prime College today. There were 2 regular talks for this meetup and one 5 minute lightening talk about the community. For this 16th installment, we did an open discussion for the first time. The topic of open discussion was “Does automated deployment and DevOps add value to the organization?”. It was the highlight of the event.

PHP Dev Meetup 16 Open Panel discussion on DevOps

Do you write at least 10 lines of code a day in any programming language? Do you work alone or in a team? If your answer is yes to both questions, you need to learn git even if you work alone in a project. Git is the most popular versions control system and it has become a must have software engineer skill.

I have seen teams fall into this trap of git conflicts when they start using git and some type of gitflow. Merging branches to the main branch becomes a pain when there are git conflicts. In this post I am going to reveal 3 simple rules to avoid git conflicts.

3 simple rules for less or no git conflicts