Github is a social coding tool used as a central place for projects to be stored, so that multiple users can edit the project at the same time without treading on each others toes. There are only a few commands that are needed in order to use Git well (I’d recommend https://try.github.io/levels/1/challenges/1 as a starting point for a fun interactive way to learn the basics), but there are also additional commands to learn. Git can be downloaded onto your desktop, or you can simply use the terminal, which is my personal preference. A repository needs to be set up if you are starting a project, but someone else on our team does this for us.
Here’s a quick introduction on how I use Git for my everyday projects through terminal, including downloading an existing project or committing files into a current project:
ls Checking my current location. This will bring up a list of all the directories that you can change into to work on your project from. cd Documents/Work/Projects/Example_Project Change directory. In this example, I have gone through my folders to my 'Example_Project'. Because I was aware of the folder progression to get to my needed directory, I have cd'd all in one line. This can be done over several lines of 'ls' and 'cd' to check current locations before going back into them. Note: Ensure that the correct case is used for your directories. Using 'd' instead of 'D' would make all the difference. Note: If you have cd'd into the wrong directory, use 'cd ..' to go backwards by one directory. git clone https://github.com/DigitalInnovation/BigScreen.git This will begin cloning the chosen repository into your local directory. You can get the clone URL from the repository's Github page. git status To check the status of the repository: whether there are any changes from your local to commit, or whether someone else has updated their side of the project and files need to be pulled. It should also tell you which branch you are on. git branch -a If you need to know what branch you are currently on or what other branches are available, locally and remotely, enter this command. It will show all the branches in your repository and the one marked with a * is the one that you are working from. Note: Branches are used so that people working on the same repository have their own area to work off of for their own feature. There will be a 'master' branch which should never be worked directly from in case something goes wrong - things should only be merged to this branch later on. There should also be a develop branch for new features to be merged to ready for testing and eventually to be merged to master. A new branch should be created with a name for a feature/bug, and then this branch should be used, merged and then deleted once finished with. git checkout -b newBranch This command will get you off of your current branch and creating a new branch at the same time. Note: When creating a new branch, ensure that you are currently on the develop branch so that new branches will come off this file. You should also pull from develop before creating a new branch. The develop branch should be the most up to date branch that people are working from, aside from master. This saves your branches all getting crossed and having merge problems in the future with overlapping code. git checkout develop Or you can simply switch to another existing branch. git branch -d newBranch To delete the branch locally. git branch -D newBranch If you have a problem with the lowercase d, this should get rid of the branch for sure. Make sure you check online that all your changes have been merged before this permanent deletion. git push origin :newBranch To delete the branch from the github repo. Note: Ensure that there are no merges waiting on the github repo relating to your branch and ensure that you definitely want to do this. git fetch --all Fetches all branches. git remote prune origin Prunes your branches to get rid of ones that other people may have deleted and that you haven't removed yet. Ensures branch consistency among all those working on the same repo. git add --all Adds all changed your files from your local repository ready for committing. git commit -m "Feature description" When adding some changes to the git repo, they need to be staged to commit. Once you ensure that you are on the right branch and you have run a git status, they need to be staged. Run this command and enter a description ready for pushing to the remote branch. git commit -m "comment comment --skip-ci" As our repo is integrated with Codeship, which does our CI stuff for us, we get notifications. This just stops CI being run every time. When we do a final commit on our branch, then we run the normal git commit without the ci part at the end to ensure that everything is working correctly. git commit --allow-empty -m "comment" Runs an empty commit, which is handy when needing to test CI. git push origin exampleBranch This will push the changes to Git: from the branch that you have been working on locally to the branch online. After this, one more git status should be entered to check that everything has been committed correctly. Note: You can also replace 'exampleBranch' with 'head', which will select all from the local branch. Note: After going onto Git, you should be able to see the changes that you've committed. To merge these, you need to select your commit and create a new pull request from one branch to the branch you need. You can merge these yourself, but it is better for someone else to code review for you. You can see the code that has been changed and deleted by viewing the commits on github. git stash To store your code locally but restore your branch to the last commit. You can get your code back later if needed. git stash list: To see what stashes have been stored. git stash apply To get the stashed work back. git pull To get files from the repo that others may have committed. When running a git status, you will be told if your local branch isn't up to date with the online one. git fetch Longhand for git pull. git mergetool Opens up the merge tool to fix any conflicts. Simply save and close then follow the commands in terminal - may need to repeat depending on how many files have conflicts. i, enter, :wq When there are sometimes merges that don't require the mergetool - use these commands to enable editing (i), then write your comment in the > sections (using enter and the arrow keys to get there), then exit and save the merge comment (:wq).
git clean -d -fx ""To remove untracked files and directories. Sometimes there will be a message appear when trying to change branches of some untracked files that haven't been committed. This comand will remove them but remember to check whether they are needed, especially as this is a force command (-f)
git reset --soft HEAD^ To move mistakenly committed files from a previous commit back to the staging area. Excellent for when you have added a file into a commit by mistake. Can be used even when the commit has been pushed to a branch, while still saving your changes to them locally.
This is a brief explanation of Git and how I use it day to day. These commands are the common ones used but there are plenty more. You may also end up in Vim...which is hard to get out of!