search

hassonlab / 247-pickling

Contains code to create pickles from raw/processed data
1 stars 10 forks source link

Revert "Dev to Main 20230126" #146

Closed zkokaja closed 1 year ago

zkokaja commented 1 year ago

Reverts hassonlab/247-pickling#144 so we can merge instead of rebase

hvgazula commented 1 year ago

https://www.atlassian.com/git/tutorials/merging-vs-rebasing never been a fan of rebase but what exactly is the reason (to choose this over merge) other than to avoid that extra merge commit? 🤷

hvgazula commented 1 year ago

looks overloaded :) image

VeritasJoker commented 1 year ago

Yeah we won't do the rebase in the future

zkokaja commented 1 year ago

Because dev will be behind main by one commit, but rebase didn't work for us either

hvgazula commented 1 year ago

Because dev will be behind main by one commit, but rebase didn't work for us either

Okay. Probably, next time, the PR creator should do the merging as well to avoid those bloated commit messages :). @VeritasJoker This one's on you 🤣.