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-25 00:32:14 -05:00
a.out almost done with commands 2015-09-22 22:16:39 -05:00
Attribute.cpp updates 2015-09-22 21:17:45 -05:00
Attribute.h fixed rename 2015-09-22 09:03:42 -05:00
Condition.h fixed rename 2015-09-22 18:42:50 -05:00
DBEngine.cpp Added the save function 2015-09-25 00:31:23 -05:00
DBEngine.h Update DBEngine.h 2015-09-25 00:30:32 -05:00
OUTPUT.txt parser OUTPUT.txt finished 2015-09-22 23:03:50 -05:00
Parserv3.h Update Parserv3.h 2015-09-25 00:30:09 -05:00
README.txt added README.txt 2015-09-14 15:54:08 -05:00
Relation.cpp fixed rename 2015-09-22 09:03:42 -05:00
Relation.h updates 2015-09-22 21:17:45 -05:00
test.cpp Update test.cpp 2015-09-25 00:29:00 -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.

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.