Michaël De Boey
Michaël De Boey
@aaronpowell I think some things went wrong with rebasing. If you can't figure it out, you could do ```sh git reset --hard dev git cherry-pick [commit-sha] ``` You need to...
@aaronpowell Could you please run the following to make sure we're not breaking `yarn.lock` with the rebases? ```sh git checkout dev yarn.lock && yarn clean && yarn ```
@aaronpowell Please rebase your branch onto latest `dev` & resolve conflicts.
@aaronpowell Could you please rebase on latest `dev`? It seems like you have some other commits in here as well somehow 🤔 Don't forget to use `git push -f` when...
@aaronpowell It seems like you have some changes from `main` as well somehow 🤔 Could you maybe try the following? ```sh git reset --hard 6fd704c && git rebase dev &&...
This PR still has some commits that doesn't belong here 🤔 Can you maybe just do the following please? ```sh git reset --hard 6fd704c && git push -f ```
@aaronpowell Looking at the changes, it seems like it already got messed up before. Maybe it's a good idea to just do a hard reset on `dev` & cherry-pick all...
@aaronpowell If you do `git cherry-pick [COMMIT-SHA]`, you can keep all of @mcansh's changes and he will be properly mentioned as the author of them. You'll just have a long...
@aaronpowell Calling the following, should do the trick I think 🙏 ```sh git reset --hard dev && git cherry-pick 1361d16^..6fd704c && git push -f ```
@derkoe The team will look into this PR whenever they have the time for it, but new adapters are not high on the priority list for the moment.