Skip to content

Conversation

@maxime1992
Copy link
Contributor

@maxime1992 maxime1992 commented Jun 10, 2022

⚠️ Review after #259 is merged ⚠️

✔️

@maxime1992 maxime1992 requested a review from zakhenry June 10, 2022 13:31
@maxime1992 maxime1992 self-assigned this Jun 10, 2022
@zakhenry zakhenry force-pushed the feat/remove-deprecated-api branch from ef5cf1c to db6f1c9 Compare June 13, 2022 04:11
@zakhenry
Copy link
Contributor

zakhenry commented Jun 13, 2022

rebased locally and force pushed. @maxime1992 did something go weird with your git setup or workflow? Not sure why these MR's are only giving the option to Rebase and merge? It's messing with subsequent merge requests because they don't get the correct history and have to be rebased manually because of conflicts.

We should just do merge commits IMO, it is a true record of the history

@maxime1992
Copy link
Contributor Author

rebased locally and force pushed. @maxime1992 did something go weird with your git setup or workflow? Not sure why these MR's are only giving the option to Rebase and merge? It's messing with subsequent merge requests because they don't get the correct history and have to be rebased manually because of conflicts.

We should just do merge commits IMO, it is a true record of the history

We had this in the settings:

image

I've turned it off

BREAKING CHANGE: The old API is not available anymore
@maxime1992 maxime1992 force-pushed the feat/remove-deprecated-api branch from 6918cad to 4ab50c5 Compare December 7, 2022 08:32
Copy link
Contributor Author

@maxime1992 maxime1992 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Self reviewed, lgtm

@maxime1992 maxime1992 merged commit 0d6782a into master Dec 7, 2022
@maxime1992 maxime1992 deleted the feat/remove-deprecated-api branch December 7, 2022 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants