search

flightstats / hub

fault tolerant, highly available service for data storage and distribution
http://www.flightstats.com
MIT License
103 stars 35 forks source link

Releasing HUB-1333 and HUB-1347 #1356

Closed mishraa8 closed 6 months ago

lkemmerer commented 6 months ago

Is the commit history going to get weirder and weirder because we didn't do a fast-forward merge of develop into master last time? I'd like us to figure out how to get things into a state that master's history is the same as develop up to new work that we want to merge in. Maybe to get there we would need to do a one-time interactive rebase and force push of develop to what's on master? I'm not sure.

lkemmerer commented 6 months ago

To help what I fear might happen currently, I updated the master and develop branch to require linear history -- https://github.com/flightstats/hub/settings/branch_protection_rules/2131062. This will prevent merge commits and allow EITHER squash commits (for develop) or multiple commits that have been rebased on master.

mishraa8 commented 6 months ago

Yes, Agree with your point @lkemmerer , master and develop branch history would never be same, and it can go worse. We can do deleting Develop branch and create Develop branch again. For that I can go ahead and do that. Hope that will make it clear. Going forward with Linear History enabled it will be clean and same as master history.