search

nus-cs2103-AY1920S1 / forum

Forum
1 stars 1 forks source link

Squash when merging? #107

Closed C-likethis123 closed 4 years ago

C-likethis123 commented 4 years ago

After a PR to the team repo is approved, we can either choose to squash and merge the PR to the team repo or to create a merge commit. My team prefers to squash and merge. Is there any requirement on which option to choose, or is it up to our team to decide what to do? Also, how about rebasing?

damithc commented 4 years ago

It's up to your team.

C-likethis123 commented 4 years ago

Noted. Thank you for your reply!