Costas carles Pull Recuest Dev - #31
Open
costascarles wants to merge 3 commits into
Open
Conversation
added 3 commits
October 11, 2016 19:47
# Conflicts: # css/team.css # index.html
# Conflicts: # css/team.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hola Carles, m'has enviat fitxers que contenen parts de codi que són de conflictes que no s'han resolt. El Pull Request que m'has enviat el puc fusionar però els fitxers no són correctes. Si els revises veuràs que hi ha línies de codi com "<<<<<<< HEAD" o d'altres similars. Això és que en algun moment els teus fitxers en local han tingut algun conflicte. Quan passa això cal deixar en la teva còpia en local els fitxers correctes i posteriorment fer un add dels fitxers corregits i després un commit.
Si corregeixes aquests errors em pots tornar a fer el Pull Request.
Qualsevol dubte ho comentem el dimarts. Jo estic de 18h a 19h a la sala de professors si fos necessari.