name: portada class: portada-slide, middle, right # Branques en Git ## __UD2:__ Introducció a Git .footnote[Joan Puigcerver Ibáñez ([j.puigcerveribanez@edu.gva.es](mailto:j.puigcerveribanez@edu.gva.es))] --- layout: true class: regular-slide .right[.logo[]] --- # Branches .img-75[] --- # Checkout .img-75[] --- # Branches  --- # Push --set-upstream ```text fatal: The current branch change_alice has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin change_alice ``` --- # Merging: Fast-Forwart __Before__  --- # Merging: Fast-Forwart __After__  --- # Merging: Divergent branches __Before__  --- # Merging: Divergent branches __After__  --- # Resolving conflicts __Before__ ```text <<<<<<< HEAD Hi! I'm Bob. I've been here for a while now. ======= Hi! I'm Bobby. I'm new here. >>>>>>> bobby_branch [... whatever you've put on line 2] ``` __After__ ```text Hi! I'm Bobby. I've been here for a while now. [...] ``` --- # Rebase __Before__  --- # Rebase __After__  --- # Many Dev Enviorments  --- # Fetch  --- # Pull