Unroll PR93 and restore master #114
Conversation
|
Thank you @kodaman2 for this work. |
|
You have some conflicts with master branch, did you see that? |
|
@lauthieb Yes, it is expected since we're using an old branch. You'll have to merge manually in the cmd line and when fixing the conflicts you'll need to select this branch as the correct code not the master code. If I do a merge master on this branch it will mess it up, since master is screwed up. There may or may not be some force merging to do not sure, is not an everyday thing to revert to an old commit. Btw probably easier to fix conflicts on vscode you get the arrows and buttons for easy selection. |
|
Hi @kodaman2, sorry but I don't unterstand what to do. For me it works when I'm on your branch. Do you want that I force push on |
|
Yes, that can do the job too. |
|
Do we lost some commits if I force push your branch on master ? |
PR #93 is the only major commit removed. Have a look at commits and checkout the commits after PR #93 there isn't anything major, and that's why I did this branch manually if it was tons of commits I wouldn't have done it this quick, it would have taken weeks. Sorry for not being clear earlier. 😔 |
|
No problem @kodaman2, thanks a lot for this great job. I will force push your Pull Request on master and make a release :) |
Given that @jack-chapman did not respond to any message I have undone PR93 after trying to cherry pick packages I just couldn't figure out which specific package broke it, probably an issue with webpack or maybe one of the css plugins not sure though.
I branched off 29d3a74
Below is a list of additions to this PR:
I've tested dev and build on windows 10 and osx mojave, but please have another member test to make sure I didn't miss anything.
@flashadvocate please do the do and ensure GHE still works.
Once this is tested and merged on master, please ensure any new PR's have master merged to their PR otherwise it will undue what I have done and have conflicts for sure.