Skip to content

Instantly share code, notes, and snippets.

@tiagoogk
Last active December 3, 2021 18:34
Show Gist options
  • Star 6 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save tiagoogk/4a6459195f8357aeb208a873d95e4703 to your computer and use it in GitHub Desktop.
Save tiagoogk/4a6459195f8357aeb208a873d95e4703 to your computer and use it in GitHub Desktop.
1. Commit
git checkout tema-x
git add “file.ext” OU git add tema-x
git commit -m “add tema x”
git push --set-upstream origin tema-x
1.1. Atualizar PR
git add “file.ext” OU git add tema-x
git commit -m “add tema x”
git push -f
2. Atualizar master
git checkout master
git pull ilegra master
git checkout tema-x
git merge master
git push
git branch tema-x+1
3. Gitignore
na pasta do tema-x na branch do tema-x
touch .gitignore
vim .gitignore
adicionar o que está abaixo:
.gitignore
**/bin/*
**/build/*
**/.idea/*
**/.settings/*
**/gradle/*
.classpath
.project
.xml
.iml
/.metadata/
/.recommenders/
/out/
esc
:wq (para salvar)
e daí dá o commit do projeto
Adicionar Repositorio:
git clone *fork*
git remote -v (Precisa aparecer origin.. e origin ..)
git remote add ilegra *link do repositorio (ilegra)*
git remote -v (Precisa aparecer ilegra ilegra - repositorio original | origin origin - forkado)
git pull ilegra master (Na master)
git pul ilegra master (Na Branch)
Criar uma Branch:
git checkout master
git pull ilegra master
git checkout -b *Nome da branch*
Após o PR for aprovado:
git checkout master
git pull ilegra master
git branch -d tema-x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment