devfzn/basicos_git
devfzn/basicos_git
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Update 'Workflows y acciones colaborativas'

jp.av.dev 2021-07-02 21:26:28 -04:00
parent 694911eb5a
commit 6823431e04
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Workflows-y-acciones-colaborativas.md

@ -97,24 +97,24 @@ Se tiene:
# git config --local user.email "mail" # git config --local user.email "mail"
# git config --local core.sshCommand "ssh -i ~/.ssh/llave_ssh -F /dev/null" # git config --local core.sshCommand "ssh -i ~/.ssh/llave_ssh -F /dev/null"
# Agregar como origen el repositorio personal, Fork de otro repositorio "Agregar como origen el repositorio personal, Fork de otro repositorio"
git remote add origin gitea@gitea.kickto.net/jp.av.dev/testingFork.git git remote add origin gitea@gitea.kickto.net/jp.av.dev/testingFork.git
# Agregar como upstream el repositorio original, Forked "Agregar como upstream el repositorio original, Forked"
git remote add upstream https://gitea.kickto.net/Fuzan/testingFork.git git remote add upstream https://gitea.kickto.net/Fuzan/testingFork.git
# Descargar upstream y fusionar con origin (repositorio Fork personal) "Descargar upstream y fusionar con origin (repositorio Fork personal)"
git fetch upstream git fetch upstream
git merge origin/master git merge origin/master
# Descargar y fusionar cambios del repositorio Forked "Descargar y fusionar cambios del repositorio Forked"
git fetch upstream git fetch upstream
git merge upstream/master git merge upstream/master
# Subir los cambios a Repositorio Fork "Subir los cambios a Repositorio Fork"
git push origin master git push origin master
# Solicitar fusionar cambios a Repositorio Original Forked (pull request) "Solicitar fusionar cambios a Repositorio Original Forked (pull request)"
git push origin upstream git push origin upstream
``` ```
![fork-workflow](https://gitea.kickto.net/jp.av.dev/basicos_git/raw/branch/master/assets/images/fork-workflow.png) ![fork-workflow](https://gitea.kickto.net/jp.av.dev/basicos_git/raw/branch/master/assets/images/fork-workflow.png)