I would never rebase at the command line and avoid rebasing generally to the chagrin of team mates. A merge retains the information to reconstruct the rebase an

I would never rebase at the command line and avoid rebasing generally to the chagrin of team mates. A merge retains the information to reconstruct the rebase anyway so might as well use the simpler option. Unless there are a lot of commits such that in aggregate they conflict but individually they apply smoothly.