MichaelPachec0
commented
2 years ago -
Choice 1: revert and then ask for a reissue: i can revert this PR's code so that the repository is in a sane state. This would mean that there would have to be a reissue of the PR, with the front end code changes in the correct path's. The PR owner would have to carefully pick and choose which code should be committed since as i mentioned earlier, front end code has been merged.
-
Choice 2: Since the PR has already been committed, we can have the front end devs pick and choose code they would like to keep, send pr's and once front end devs are happy with the code in the public folder, delete the files.
Choice 1 will probably be the best way to do this. But ill leave to the front end to decide.
So its come to my attention that #45 committed a copy of the front-end to the root folder. The back end code code wont serve this since it will only look at the files that are in the public folder and only in the public folder. Since there have been new commits to the front end, there is divergence. In this case the front end developers need to decide whether to keep and if so what to keep from what this pr merged.