GIT merge vs rebase

When we conduct a project with a large team source management is very important, each project has it own rules. Keep git source tree clean is one of the most significant criteria. We usually use two way to merge code from a branch to another: merge a...