DEV Community

Discussion on: What's your Git Personality?

Collapse
 
mfurmaniuk profile image
Michael

Done most but not rebase, seen that cause nothing but problems as it tends to get used incorrectly by people not familiar with it

Collapse
 
xtofl profile image
xtofl

This feeling I recognize. But I think my colleagues are smarter than me, so they should be able to master the tools. I advise our team to rebase.

Those tiny fixups, the style changes, the reverts... They matter to your coding coach, or serve as a short term backup, but should not at all end up in the code history.

I must say that those who can truly limit their changes to what is required (and not add unrelated changes) barely ever need to ask for help rebasing. The others complain about conflicts.

Rebase-chains take some time to master. But the resulting history leaves no doubt about what is in a merge request, in a release, a patch, ...