Skip to content

Git Shell

Jump to bottom
Connor L Jackson edited this page Oct 15, 2016 · 1 revision
Clone this wiki locally

Git shell is a nice way to familiarize yourself with using git in the command line.

Please follow the following steps to get started using git!

  1. You can use git clone https://github.uconn.edu/arc12012/2017-CSE-Senior-Project-Team-2.git to clone our repository locally to your computer. You only need to do this once - unless you delete the path later.

  2. Each time you start working on your part of the project you should do the following:

    git checkout master

    git pull

    This way, you keep your local master branch up to date.

  3. Whenever you are working on a part of a feature, you should create a branch! Do this with git branch myBranch, where "myBranch" can be whatever you want to call it. This will be where you do all your work, and you should keep in mind to design your implementations in a modular way so that you can merge your designs with ease later on. This means you should try to avoid editing pre-existing files & code as much as you can!

  4. When you have made a milestone on that branch, (I.E fixed a big bug, major design change, etc.) you should commit your changes to your local repository! You can do that with git commit -a -m "Here is my commit message."

  5. When you have completed your feature, and think you are ready to add it to the rest of the project, you should review your feature with the team so everyone has equal opportunity to voice their opinions about whether it's complete, needs adjustments, is missing something, etc.

  6. Once approved, we can then merge the branch to master!

    git checkout master - Changes working directory to master.

    git pull - Gets all updates from the remote repository.

    git merge myBranch - Merges myBranch with the current branch you are on, which is master.

    git push - Pushes your feature to the remote repository.

    At this point, your feature should now be recognized as committed by our remote repository!

COMING SOON - Resolving a merge conflict.