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-10-06 12:19:01 -05:00
a.out delete and update work 2015-10-05 16:58:07 -05:00
Attribute.cpp update works 2015-10-05 16:50:19 -05:00
Attribute.h Updated user.h 2015-09-30 17:10:16 -05:00
Condition.cpp Updated user.h 2015-09-30 17:10:16 -05:00
Condition.h Updated user.h 2015-09-30 17:10:16 -05:00
DBAppV2.cpp Added login, account management, sample relations 2015-10-06 12:19:01 -05:00
DBEngine.cpp delete and update work 2015-10-05 16:58:07 -05:00
DBEngine.h delete and update work 2015-10-05 16:58:07 -05:00
Parser.cpp Fixed github issues. 2015-09-30 20:08:29 -05:00
Parser.h Updated user.h 2015-09-30 17:10:16 -05:00
README.txt Updated user.h 2015-09-30 17:10:16 -05:00
Relation.cpp update works 2015-10-05 16:50:19 -05:00
Relation.h update works 2015-10-05 16:50:19 -05:00
savefile.txt Updated user.h 2015-09-30 17:10:16 -05:00
test Fixed github issues. 2015-09-30 20:08:29 -05:00
test.cpp delete and update work 2015-10-05 16:58:07 -05:00
user.cpp Update user.cpp 2015-10-06 12:18:08 -05:00
user.h Update user.h 2015-10-06 12:17:54 -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

ALSO, now that we are compiling into a standalone executable, compile using this command:

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

"test" can be anything you want, but for now our executable is "test".

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

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.