If for whatever reason the GUI is failing to work, attempt the following solutions as applicable. Note: These are UNIX solutions as Windows terminal support is awful. Ryan, best of luck.
#Open a terminal
git clone https://github.com/Katacka/Dominion/ #This should create a directory containing the git repo, prepend sudo if necessary
#Open the resulting folder as a new project within Android Studio
#Things should work
#Open a terminal
git checkout <Your_Name>_<Push_Description> #We're going to store all of our changes in a particular branch
git add -A && git commit -m "<Your_Message>" #In case any files have not been committed
git remote add origin https://github.com/Katacka/Dominion/ #Stores a reference to this repo in the alias origin
git push origin master --force #Actually pushes to the repo. As things stand I'll have to merge any changes, but we can develop a better model in the future
Hopefully that worked to some degree or other!
When starting from scratch, follow all steps as listed below. If you have already intialized a git repo, feel free to skip the first step and instead begin at the point as marked below.
git clone https://github.com/Katacka/Dominion.git #Serves to download the repo, setting your remote origin for future pushes
git pull #Origin should be set automatically (having once cloned the proper repo) if errors arise run the following command
git remote set-url origin https://github.com/Katacka/Dominion.git #With any luck, this should reset your origin
#Re-running git pull should now work
git checkout <Your_Name>_<Push_Description> #The push description should describe the changes you imagine you'll be making
#Admittedly, its ultimately arbitrary what you call the branch, so anything conventionally clear will work
git add --all #Add every file not specified within the project-level relevant .gitignore
git commit -m "<Message>" #Commit all the files just added under the commit description, <Message>
git push origin <Your_Branch_Name> #This will push your branch to upstream
#If for some reason you cannot recall your branch name run git status
#If origin errors, try resetting it with git remote set-url origin https://github.com/Katacka/Dominion.git
#This following section should not be considered part of a generic workflow, however may prove useful when dealing with merge conflicts. While these really shouldn't arise based on our weekly push philosophy, where we will all sync up, its better to be safe than sorry..?
#If you receive a merge error run git mergetool
#Or edit the file by hand to remove the conflict, this is probably more work in most cases