Skip to content

Developer Notes and Practices

Tpimp edited this page Dec 12, 2012 · 7 revisions

Developer Notes

To All Contributors, Below is some quick notes on using git with the AIDE project.

Common Git Commands

-- Git Clone a new copy of the master repository (From a folder not containing an "AIDE" folder) -- git clone git@github.com:Tpimp/AIDE.git

-- Git Pull (Update/Sync) with master -- git pull git@github.com:Tpimp/AIDE.git

-- Git Add Changes (All) -- git add -A

-- Git commit all w/ a message -- git commit -am "Message Describing the Changes Made in this Commit"

-- Git Push committed changes to master -- git push git@github.com:Tpimp/AIDE.git

-- Create new branch -- git branch "new_branch_name"

-- Switch To/Checkout Branch -- git checkout "new_branch_name"

-- merge Branch (current branch = source, referenced branch = destination) -- git merge "master"

-- Stash changes command -- git stash

-- Unstash changes -- git stash apply

Common Git practices

-- Create a New Copy of the Project --

  • navigate to the desired parent directory
  • run clone command (See Git Common Commands)

-- Create a new feature (and branch technique. Do this for all newly created features!) --

  • Run Sync command to update/sync your master branch (See Git Common Commands)
  • create a new branch for the feature (See Git Common Commands)
  • switch to the newly created branch (See Git Common Commands)
  • Do all preliminary building and work on new feature (only work on new feature code here)
  • After testing the reliability of New Feature X, run merge command from new_feature branch on "master" (See Git Common Commands)
  • run add all command (See Git Common Commands)
  • run commit command and add a descriptive message (See Git Common Commands)
  • switch to "master" branch (See Git Common Commands)
  • run the push command (See Git Common Commands)

-- Stash current changes before updating then re-apply changes --

  • Run Stash Changes command (See Git Common Commands)
  • Run Pull(sync) command (See Git Common Commands)
  • Run Unstash Changes command (See Git Common Commands)

-More Developer Notes to come...

Clone this wiki locally