search

phpsword / sword-bundle

Modern WordPress development with Symfony
https://getsword.com
MIT License
124 stars 4 forks source link

Rebase or merge? Opinions needed #16

Closed williarin closed 11 months ago

williarin commented 1 year ago

What's the best option for PRs, rebase or merge? I've only worked with rebase so far as mostly the sole contributor but it seems that it creates co-authored commits when a contributor makes a PR, which is odd.

Any opinion on what is the cleaner for open-source projects?

loicrey commented 1 year ago

I personally prefer using rebase to update working branch with staging or master, and using merge to retrieve work from someone else, or when approving and merging pull request to common branches like staging. It's more clear for me, and it's also easier to revert because you just need the merge commit using git revert -m commithash

We also do this where I work (+50 developers)

williarin commented 11 months ago

Thanks, it seems indeed to be the best option.