Good one, everyday I have to explain one of my coleague engineer why he should not just take a shortcut and merge it, rebase it instead it could be bit painful

Good one, everyday I have to explain one of my coleague engineer why he should not just take a shortcut and merge it, rebase it instead it could be bit painful to resolve the conflict as we continue to rebase but definately cleaner.