Comando para configuração

Comandos-Git

# Passo 1: Faça o fork do repositório: https://github.com/buritech/buriapp
# Passo 2: Clone o seu fork 
$ git clone git@github.com:marciopalheta/buriapp.git
# Passo 3: Entre na nova pasta 
$ cd buriapp
# Passo 4: consultar branchs gerados (opicional)
$ git branch 
# Passo 5: Adicionar repositório da buritech
$ git remote add "buritech" git@github.com:buritech/buriapp.git
# Passo 5.5: consultar repositorios remotos:
$ git remote
# Passo 6: Atualizar cópia da buritech
$ git fetch buritech
# Passo 7: Criar o branch local
$ git checkout -b pbi.01.04
# Passo 8: Atualizar o branch local com o contúdo da buritech
$ git merge buritech/pbi.01.04
# Passo 9: Em caso de merge, execute a ferramenta para solução de conflitos
$ git mergetool 

#10: Caso o .gitignore para de funcionar:
git rm -r --cached .

#11: Remover um branch local:
git branch -d the_local_branch

#12: Remover um branch remoto:
git push origin :the_remote_branch


########################## Resolvendo merge depois do Pull request ########################## 
Checkout via command line
If you cannot merge a pull request automatically here, you have the option of checking it out via command line to resolve conflicts and perform a manual merge.

Step 1: From your project repository, bring in the changes and test.
git fetch origin
git checkout -b optimization_experiments_azure origin/optimization_experiments_azure
git merge master

Step 2: Merge the changes and update on GitHub.
git checkout master
git merge --no-ff optimization_experiments_azure
git push origin master


#Ferramenta para resolver conflitos de merge
http://www.perforce.com/downloads/20-User?qt-perforce_downloads_step_3=1#product-10

#Atualizações do arquivo ~/.gitconfig

########################## Mergetool for mac ########################## 
[merge]
        keepBackup = false
        tool = p4merge
        
[mergetool "p4merge"]
        cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
        keepTemporaries = false
        trustExitCode = false
        keepBackup = false

########################## Mergetool for windows ########################## 
[merge]
	tool = p4merge
[mergetool "p4merge"]
	cmd = p4merge.exe \"\" \"\" \"\" \"\"
	path = C:\\Program Files\\Perforce\\p4merge.exe

########################## Mergetool for LINUX ########################## 

#cópia de arquivos para a pasta /opt/p4merge
[~/Downloads/p4merge/p4v-2014.1.888424]$ sudo mv * /opt/p4merge

#Criação de link em USR
sudo ln -s /opt/p4merge/bin/p4merge /usr/local/bin/p4merge

#Atualização do arquivo ~/.gitconfig:
[merge]
    keepBackup = false;
    tool = p4merge
[mergetool]
    prompt = false
[mergetool "p4merge"]
    cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
[diff]
    tool = p4merge
[difftool]
    prompt = false
[difftool "p4merge"]
    cmd = p4merge "$LOCAL" "$REMOTE"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false