Please let me know if anything is still confusing, or if this sequence of events isn't the most helpful.
- Open Command Prompt.
- Navigate to where you want your project to be.
- Clone the existing repository.
git clone https://github.com/Coletterbox/RabbitProject.git
- CD into the project folder.
cd RabbitProject
- If you want to see the local branches:
git branch
Or if you want to see all branches, including remote:
git branch -a
- If the branch you want to work on already exists, switch to it.
git checkout [branch name]
Or create a new branch and switch to it.
git checkout -b [branch name]
- Work on your code! :)
- Check the status if you want to see which files have been changed.
git status
- Add the files you've changed to the staging area.
git add [file name]
- Commit your changes (don't forget to add a commit message)!
git commit -m "[commit message]"
If you forget to add a commit message, you can exit Vim by typing ":wq" at the bottom and pressing enter.
- Make sure that your version of the project is up to date (i.e. that no one has pushed any changes between when you last pulled and now) by pulling again.
git pull
- Push your changes.
git push origin [branch name]
-
"It's saying I've changed files that I haven't."
- Try "git diff" to see the changes. That will shed some light on whether it's just your linter (if you have one), or if maybe you didn't merge some changes that you thought you did, etc.
git diff- To see changes in files you've already staged:
git diff --staged -
"Why does it keep saying I've changed RabbitProject.iml?"
- I don't know.
(Okay, fine, see below.)
-
"Why can't I see the branches I expect to see?"
- You may be looking at local branches specifically. This is the command to also see remote branches:
git branch -a- You may have an old version of the repo that doesn't have the branch. Pull the most recent version.
git pull -
"What if I have changes that I don't want to commit, but I want a clean working tree?"
- You can stash changes, and an upside of this is that it doesn't actually delete them.
git stash -
"I accidentally staged a file that I didn't mean to."
- To remove a file from the staging area:
git reset [file name] -
"Where did [person] go?!"
- They're probably peeing, but try sending another message in all caps this time.
- Sometimes it's really easy to miss that the command line is telling you that it has run into a problem. The text will be calm and white, but it will (for example) be telling you that the merge you just attempted actually failed, so when you next start the process of adding and committing, it will tell you that a whole bunch of files have changed, and you won't know why. Or you'll end up in a situation where you'll be very convinced that you have the latest version of the project, when you actually don't. That's why we have to be super careful about reading what the terminal says! :)
- Regarding RabbitProject.iml, we just need to decide whether or not it goes in the .gitignore and be consistent about it. In general, if it says you've made changes to a file (and the terminal's complaining about potentially overwriting it) but you don't see any (using git diff) and you're sure you didn't actually change it, just stash the changes or something; no one cares. It'll be fine. But it seems like we're leaning towards adding RabbitProject.iml to the .gitignore, anyway.
- Sometimes people have been very confused about why they don't seem to have the whole project, when they've only pulled one branch. "git pull origin [branch name]" will only pull the specified branch.