search

breejs / bree

Bree is a Node.js and JavaScript job task scheduler with worker threads, cron, Date, and human syntax. Built for @ladjs, @forwardemail, @spamscanner, @cabinjs.
https://jobscheduler.net
MIT License
3.06k stars 79 forks source link

[dicsussion] merges vs rebases #67

Closed naz closed 3 years ago

naz commented 3 years ago

Is there a preference on how PRs/changes from branches are merged into master?

I have slight preference towards keeping the master as clean as possible so would prefer clean rebase or squash+rebase combination. Can check an example project history using this pattern in Ghost - https://github.com/TryGhost/Ghost/commits/master.

Don't mind keeping the current pattern as well. Just wanted to have this written down somewhere for clarity :)

naz commented 3 years ago

@niftylettuce @shadowgate15 do you have any particular opinions on this topic?

niftylettuce commented 3 years ago

I have no opinion really, as long as git log is not too crazy, as long as stuff gets shipped is my mentality

naz commented 3 years ago

Awesome. I'll stick to the habit of rebasing changes to keep the log clean. I'm on the same page regarding optimization towards shipping speed :+1: