Fixed a lot of merge conflicts and bugs for the project review on Friday morning, this took around 2-3 hours as the issues had to reverted to track down what merge was causing issues then after doing that for a while more in need force was required as I reverted to an older save before these merges were made then had to go through each file and implement it into a new branch then I tested that branch on the server , still had issues after this, then got it to work 2 times, pushed to main, then main had issues, I found out that the this issue was on previous merges but was never a problem until my login and signup implementation. so i fixed it on the main. got someone else to test it and we are now able to access front end and back end stuff. Kevin helped me verify on his end that things were good and then we are now up to date for review
Fixed a lot of merge conflicts and bugs for the project review on Friday morning, this took around 2-3 hours as the issues had to reverted to track down what merge was causing issues then after doing that for a while more in need force was required as I reverted to an older save before these merges were made then had to go through each file and implement it into a new branch then I tested that branch on the server , still had issues after this, then got it to work 2 times, pushed to main, then main had issues, I found out that the this issue was on previous merges but was never a problem until my login and signup implementation. so i fixed it on the main. got someone else to test it and we are now able to access front end and back end stuff. Kevin helped me verify on his end that things were good and then we are now up to date for review