Every story and comment from the Hacker News API, in a layout borrowed from 2001.
A comment on Ask HN: Rebase or merge Git strategy?.
If the team is spending a lot of time dealing with merge conflicts, merging vs rebasing isn't the problem.
More than likely, one or more of the following are issues:
- Too many people are making changes in parallel to the same file
- Everyone isn't consistently keeping their `dev` branch up-to-date
- Developers aren't taking the time to first merge dev into their feature branch and fix any merge conflicts before submitting a pull request
- Pull requests aren't being properly reviewed (no approvals until merge conflict addressed)
There are no comments on this comment yet.
If the team is spending a lot of time dealing with merge conflicts, merging vs rebasing isn't the problem.
More than likely, one or more of the following are issues:
- Too many people are making changes in parallel to the same file
- Everyone isn't consistently keeping their `dev` branch up-to-date
- Developers aren't taking the time to first merge dev into their feature branch and fix any merge conflicts before submitting a pull request
- Pull requests aren't being properly reviewed (no approvals until merge conflict addressed)