DEV Community

Discussion on: Fed up with Git conflictsđŸ˜€?: Rebase regularly and chill!

Collapse
 
vgoebbels profile image
Dr. Volker Göbbels

I worked as a configuration management specialist (and release manager) for several years and there not many things we so wholeheartedly despise like someone tampering with the commit history of a repo. When you have concurrent changes in the same code range you will have to resolve them manually anyway. Git has a feature called merge tracking that prevents you from remerging changes that were already applied. You'll lose that intelligence when manipulating the history like that. And by the way a git log is not a novel, it doesn't need to be clean. It should give information about each and any change made to the code :)