Tagging @iosenberg as the project leader and @yen-mai-codes since she wrote *all* of this. I just fixed merge conflicts.
What I did:
Yen's project should no longer have merge conflicts with the source branch. Additionally, since I don't understand how the react part of this project is configured, I've moved files I think we'll have to relocate into the ./old/ directory.
Notes to move forward:
For Git to know which new files relate to which old files, we should use git mv instead of mv when moving files and folders around. For instance, I recommend the following workflow:
Decide for some file in ./old/ where it should go for it to work with React.
For instance, move myfile.html to public/About
Rungit mv old/members/myfile.html public/About. Now the file is moved there, and Git knows it.
Maybe commit right then, maybe don't, but then:
Edit the file to work within the system (sandwich it in some React delivery code or something)
Definitely commit now. Take credit for your changes! Seize the day!
Tagging @iosenberg as the project leader and @yen-mai-codes since she wrote *all* of this. I just fixed merge conflicts.
What I did: Yen's project should no longer have merge conflicts with the source branch. Additionally, since I don't understand how the react part of this project is configured, I've moved files I think we'll have to relocate into the
./old/directory.Notes to move forward: For Git to know which new files relate to which old files, we should use
git mvinstead ofmvwhen moving files and folders around. For instance, I recommend the following workflow:./old/where it should go for it to work with React.myfile.htmltopublic/Aboutgit mv old/members/myfile.html public/About. Now the file is moved there, and Git knows it.