Skip to content

Feature/grupo b laura gil #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LauraGDev wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Feature/grupo b laura gil #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3559976
Actualizar README con enlaces de interes
ireneCabezas0909 May 15, 2024
9e33bec
Limpiar archivos para nuevo workshop
ireneCabezas0909 May 15, 2024
348d8c9
Anyadir comandos de interes
ireneCabezas0909 May 15, 2024
21e988b
Elimiar archivo txt y crear htmls
ireneCabezas0909 May 15, 2024
8829d89
Add useful git commands
pedroGarrido1806 May 16, 2024
54aefba
añadido nombre a la lista
LauraGDev May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
## Git Practice

Usaremos este repositorio para practicar todo tipo de commandos en git y como usarlos para resolver ciertos errores.
Esperemos que os lo paseis bien!
Esperemos que os lo paséis bien!

Fefy

### Comandos
* Clonar Repositorio: ```git clone <repository-url>```
* Crear Rama: ```git checkout -b <branch-name>```
* Moverse a otra Rama: ```git checkout <branch-name> | git switch <branch-name>```
* Añadir Cambios: ```git add <file-name>```
* Commit Cambios: ```git commit -m "commit message"```
* Push Rama: ```git push origin <branch-name>```
* Pull Cambios: ```git pull origin main```
* Resolver Conflictos: Edit manualmente, después ```git add```, ```git commit```
* Hacer Merge, ejemplo merge rama test a main:
* Asegúrate de estar en la rama a la que quieras hacer el merge ```git switch main```
* Pull the los últimos cambios de esa rama ```git pull origin main```
* Merge ```git merge test```


### Enlaces de interés

* [Juego para aprender Git](https://learngitbranching.js.org/?locale=es_ES)
* [GitHub ‘cheat sheet’](https://github.github.com/training-kit/downloads/es_ES/github-git-cheat-sheet/)
* [Tutorial de Git en terminal](https://tutorials-codebar-io.translate.goog/version-control/command-line/tutorial.html?_x_tr_sch=http&_x_tr_sl=auto&_x_tr_tl=es&_x_tr_hl=en&_x_tr_pto=wapp)
* [Consejos para solucionar errores frecuentes de Git](https://ohshitgit.com/es)
* [Mensajes de commit profesionales](http://tomasdelvechio.github.io/old/440/)
14 changes: 14 additions & 0 deletions grupoA.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Git Ejercicio Collaborativo</title>
</head>
<body>
<h1>Git Ejercicio Collaborativo</h1>
<p>Nombre y animal favorito</p>
<ul>
<li>Irene - Panda rojo</li>
</ul>
</body>
</html>
15 changes: 15 additions & 0 deletions grupoB.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Git Ejercicio Collaborativo</title>
</head>
<body>
<h1>Git Ejercicio Collaborativo</h1>
<p>Nombre y animal favorito</p>
<ul>
<li>Pedro - Panda rojo</li>
<li>Laura - Pantera negra</li>
</ul>
</body>
</html>
1 change: 0 additions & 1 deletion stephCespedes.txt
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions students.txt
View file
Open in desktop

This file was deleted.