From efb56324cffc36335328eb440deb642c1034637b Mon Sep 17 00:00:00 2001 From: Becca Date: Mon, 14 Sep 2015 16:49:57 -0500 Subject: [PATCH] fixed desync --- README.txt | 16 +++++++++------- a.out | Bin 17470 -> 0 bytes dbCmds.txt | 5 ----- 3 files changed, 9 insertions(+), 12 deletions(-) delete mode 100755 a.out delete mode 100644 dbCmds.txt diff --git a/README.txt b/README.txt index bc38460..f0ade72 100755 --- a/README.txt +++ b/README.txt @@ -2,24 +2,26 @@ I changed the name of the repo. To make everything pretty, rename your working f 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. +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. +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”. +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: +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. +Type git push and you’re done. + +MAKE SURE TO: commit often and delete your .o file before pushing. diff --git a/a.out b/a.out deleted file mode 100755 index e63ad4387585e2180cc535465889233c33d32134..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17470 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 aZCRU)?Kd&lr6OUw?{!EedD+T~Qv4Sup7)Ue diff --git a/dbCmds.txt b/dbCmds.txt deleted file mode 100644 index 9405325..0000000 --- a/dbCmds.txt +++ /dev/null @@ -1,5 +0,0 @@ -a -b -c -d -e