installed magento and edited gitignore
installed theme and menu extension
modified the gitignore file and deleted local.xml.sample
pulled from dev and resolved conflict on gitignore and local.xml
modified the gitignore file, ignore the local.xml file
resolved the conflict in gitignore file