26 lines
1.2 KiB
Text
26 lines
1.2 KiB
Text
|
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<77>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<61>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<EFBFBD>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<69>s making me do this every time I edit anything, which is weird.
|
|||
|
|
Commit changes with git commit <20>m <20>something descriptive<76>.
|
|||
|
|
|
|||
|
|
If everything works the way you<6F>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<6F>re done.
|
|||
|
|
|