It is true that things can get really messy with rebase when people don't understand what is happening. We had this problem for a while, sometimes fixing the problem requires an hour or two... However, I couldn't say that we didn't have problems with merge as well. So, I think if people don't spend enough time playing around with Git and learning how it is working and the concepts behind it, we will always end up in messed up situation.
From my experience, merge is working well enough when the team is small - let's say up to 6-8 people. There aren't so many changes that we would need to get from master branch and keeping the feature branch up to date is not so critical. However, with multiple teams working on the same codebase the situation is pretty different and merge is just not working. So, the sooner team members get familiar with more Git commands, the better.
This article is just scratching the surface and there are a lot of things going on in a large codebase with a proper Git workflow. I agree deep dive into this topic can be good for an interview.
P.S. I am thinking to share more articles about problems that we encountered in our teams - one of them will be deeper look into rebase because when we have branch from a branch things get messy.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
It is true that things can get really messy with
rebasewhen people don't understand what is happening. We had this problem for a while, sometimes fixing the problem requires an hour or two... However, I couldn't say that we didn't have problems withmergeas well. So, I think if people don't spend enough time playing around with Git and learning how it is working and the concepts behind it, we will always end up in messed up situation.From my experience,
mergeis working well enough when the team is small - let's say up to 6-8 people. There aren't so many changes that we would need to get frommasterbranch and keeping the feature branch up to date is not so critical. However, with multiple teams working on the same codebase the situation is pretty different andmergeis just not working. So, the sooner team members get familiar with more Git commands, the better.This article is just scratching the surface and there are a lot of things going on in a large codebase with a proper Git workflow. I agree deep dive into this topic can be good for an interview.
P.S. I am thinking to share more articles about problems that we encountered in our teams - one of them will be deeper look into
rebasebecause when we have branch from a branch things get messy.