No description
This repository has been archived on 2025-04-11. You can view files and clone it, but cannot push or open issues or pull requests.
Find a file
2015-09-30 17:22:27 -05:00
Attribute.cpp remove tuple implemented 2015-09-24 21:15:12 -05:00
Attribute.h remove tuple implemented 2015-09-24 21:15:12 -05:00
Condition.cpp added gettuple 2015-09-24 20:49:49 -05:00
Condition.h added gettuple 2015-09-24 20:49:49 -05:00
DBApp.cpp Commented out DBApp.cpp as it's being developed. test.cpp all tests compile and run into test file. 2015-09-27 16:48:08 -05:00
DBEngine.cpp Fixed merge issues. Everything compiles and runs again. 2015-09-27 00:58:19 -05:00
DBEngine.h Fixed merge issues. Everything compiles and runs again. 2015-09-27 00:58:19 -05:00
DevelopmentLog.pdf rename fixed and insert attributes add 2015-09-23 16:34:15 -05:00
OUTPUT.txt parser OUTPUT.txt finished 2015-09-22 23:03:50 -05:00
Parserv3.h Fixed merge issues. Everything compiles and runs again. 2015-09-27 00:58:19 -05:00
Parserv4.cpp Fixed merge issues. Everything compiles and runs again. 2015-09-27 00:58:19 -05:00
README.txt Added stoi() using in Parser, added compile message to README 2015-09-24 19:39:07 -05:00
Relation.cpp Commented out DBApp.cpp as it's being developed. test.cpp all tests compile and run into test file. 2015-09-27 16:48:08 -05:00
Relation.h remove tuple implemented 2015-09-24 21:15:12 -05:00
savefile.txt Fixed merge issues. Everything compiles and runs again. 2015-09-27 00:58:19 -05:00
test Commented out DBApp.cpp as it's being developed. test.cpp all tests compile and run into test file. 2015-09-27 16:48:08 -05:00
test.cpp Commented out DBApp.cpp as it's being developed. test.cpp all tests compile and run into test file. 2015-09-27 16:48:08 -05:00
User.h Entity Crap. Still have work to do. 2015-09-30 17:22:27 -05:00

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

//---IMPORTANT---//

The function stoi() is used in the parser .cpp file to parse integers from the input.
When compiling things with the parser included, make sure you compile using:

g++ -std=c++11 *.cpp

//---------------//

I changed the name of the repo. To make everything pretty, rename your working folder, and type this line:

	git remote set-url origin https://github.tamu.edu/USERNAME/DMS.git

I also set up development branches for each of us. I think this is the way were supposed to have it, but this is my first GitHub project so Im not at all positive.
When beginning to work:

	git checkout beccadev

This switches to your development branch. At any time, just type git status to see whats going on.
Before doing anything, type:

       git merge beccadev master
       git push
       
This updates your branch with the master branch, and pushes the update to GitHub. There is probably definitely a better way to do this. (Im pretty sure you can use git clone somehow)
Dont forgot to use git add filename.txt to add any files you want saved to git. Or just use git add * to grab them all. For some reason its making me do this every time I edit anything, which is weird.
Commit changes with git commit m “something descriptive”.

If everything works the way youve anticipated and it compiles properly and completely done, return to master with git checkout master and merge:

	git merge master beccadev

Type git push and youre done.