Skip to content

Instantly share code, notes, and snippets.

@zaoral

zaoral/rebase_steps.sh

Last active April 27, 2016 21:12
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save zaoral/de8474bda8219bd0565bdf1f17c952c4 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save zaoral/de8474bda8219bd0565bdf1f17c952c4 to your computer and use it in GitHub Desktop.
Download ZIP
Rebase Steps
Raw
rebase_steps.sh
# 1. tienes que actualizar el 8.0 de tu local porque este es el que utilizaras luego cuando actualices tu branch
git checkout 8.0
git pull vauxoo 8.0
# 2. regresas a tu branch y aplicas el rebase
git checkout tu_branch
git rebase vauxoo/8.0
# NOTA 1: el paso de la linea 3 y 7 solo te servira si tienes los remotos bien configurados.
# Esto lo ves cuando corres el siguiente comando
git remote -v
# el resultado debe ser algo como esto
vauxoo git@github.com:Vauxoo/yoytec.git (fetch)
vauxoo git@github.com:Vauxoo/yoytec.git (push)
vauxoo-dev git@github.com:vauxoo-dev/yoytec.git (fetch)
vauxoo-dev git@github.com:vauxoo-dev/yoytec.git (push)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment