merge<p>- when commits of both branch need to preserve<p>- when additional zero file “merged commit” is ok<p>- when chronology order of commits need to maintain<p>rebase<p>- when commit of both need to preserve<p>- when zero file “merged commit” is not desired<p>- when rebased branch commits need to stay on top of other branch<p>- when change of commit id is ok