ada/dmspine64backup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed desync

Browse source
This commit is contained in:
Becca 2015-09-14 16:49:57 -05:00
parent 0b3fa73bda
commit efb56324cf
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
README.txt
View file

@ -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.

BIN
a.out
View file

Binary file not shown.

5
dbCmds.txt
View file

@ -1,5 +0,0 @@
a
b
c
d
e