40 lines
1.7 KiB
Text
Executable file
40 lines
1.7 KiB
Text
Executable file
//---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 we’re supposed to have it, but this is my first GitHub project so I’m 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 what’s 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. (I’m pretty sure you can use git clone somehow)
|
||
Don’t 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 it’s 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 you’ve 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 you’re done.
|
||
|