+
+
+
+
+
+---
+
+# Sistema de control de versiones
+
+
+
+---
+
+# Sistema de control de versiones
+
+
+
+---
+
+# Sistema de control de versiones
+
+
+
+---
+
+# Sistema de control de versiones
+
+- Realiza seguimiento de cambios o **commits**
+- Es como un _deshacer_ sin límites
+- Permite que mucha gente trabaje en lo mismo en paralelo
+- **Repositorio:** El historial completo de **commits**
+
+---
+
+Imagina que has redactado un excelente párrafo para un artículo que estás
+escribiendo, pero más tarde lo estropeas.
+
+¿Cómo recuperarías aquella excelente versión de la conclusión? ¿Es esto
+posible?
+
+---
+
+
+
+# Configurando git
+
+---
+
+# Configurando git
+
+- Nombre
+- Mail
+- Editor de texto favorito
+
+---
+
+## Comandos de git
+
+- `git config --global user.name "tu_nombre"` : configura el nombre con el que
+ quedará registrada la actividad que hagas en `git`.
+- `git config --global user.email "tu_mail"` : configura el mail que quedará
+ asociado a la actividad que hagas en `git`.
+- `git config --global core.editor "tu_editor_favorito"`: configura el editor
+ que usará `git`.
+
+---
+
+
+
+# Creando un repositorio
+
+---
+
+## Comandos útiles de bash
+
+- `mkdir`: crea una nueva carpeta (_make directory_)
+- `ls`: lista los archivos y carpetas del directorio actual (_list_)
+- `cd`: cambia de directorio (_change directory_)
+
+---
+
+## Comandos de git
+
+- `git init`: crea un nuevo repositorio en la carpeta actual
+- `git status`: revisamos el estado del repositorio
+
+---
+
+
+
+# Rastreando Cambios
+
+---
+
+## Staging Area
+
+
+
+---
+
+## Comandos de git
+
+- `git add`: añade uno o más archivos al **staging area**
+- `git commit`: registra los cambios de la **staging area** en un commit
+- `git log`: muestra un historial de cambios
+- `git diff`: muestras las diferencias entre el estado actual de los archivos
+ y la versión del commit más reciente
+- `git diff --staged`: muestra las diferencias entre el estado de los archivos
+ en el staging area y la versión del commit más reciente.
+
+---
+
+## Ejercicio
+
+---
+
+## 1. Multiple choice
+
+¿Qué comandos guardarían los cambios de un archivo modificado `myfile.txt` en el repositorio creado previamente?
+
+ $ git commit -m "my recent changes"
+ $ git init myfile.txt
+ $ git commit -m "my recent changes"
+
+ $ git add myfile.txt
+ $ git commit -m "my recent changes"
+ $ git commit -m myfile.txt "my recent changes"
+
+---
+
+## Comandos de git
+
+- `HEAD`: simboliza el commit más reciente.
+- `git diff HEAD~2`: nos muestra las diferencias respecto a los últimos
+ dos commits.
+- `git show HEAD~1`: nos muestra los cambios realizados por el penúltimo commit.
+- Podemos usar el identificador del commit en vez de `HEAD`.
+- `git checkout`: nos deja _visitar_ commits anteriores.
+- Nunca hay que hacer commits si no estamos en `HEAD`.
+
+---
+
+## Ejercicios
+
+---
+
+## 2. Multiple choice
+
+Jennifer ha realizado cambios en el script en el que ha estado trabajando
+durante semanas, y las modificaciones que hizo esta mañana “corrompieron” el
+script y ya no funciona.
+Por suerte, ha estado usando Git.
+
+---
+
+## 2. Multiple choice
+
+Si Jennifer todavía no hizo ningún commit ni agrego los cambios al stage area:
+¿Cuáles comandos le permitirán recuperar la última versión estable de su script llamado script.py?
+
+$ git checkout HEAD
+ $ git checkout HEAD script.py
+ $ git checkout HEAD~1 script.py
+ $ git checkout [ID_last_commit] script.py
+ Ambos 2 y 4
+
+La vida surgió unos 1000e6 de años después de su creacion.
+
+La Tierra se formó hace aproximadamente 4550e6 de años.
+
+La vida surgió unos 1000e6 de años después de su creacion.
+La Tierra se formó hace aproximadamente 4550e6 de años.
+
+Error because you have changed tierra.txt without committing the changes
+
+
+---
+
+Hasta ahora, nuestro repositorio local:
+
+
+
+---
+
+Luego de crear un repositorio en GitHub:
+
+
+
+---
+
+Luego del primer `git push`:
+
+
+
+---
+
+## Ejercicio
+
+[https://pad.carpentries.org/coco_git_lesson](https://pad.carpentries.org/coco_git_lesson)
+
+---
+
+# Colaborando en
+
+
+
+---
+
+Luego de clonar el repositorio:
+
+
+
+---
+
+## Ejercicio
+
+[https://pad.carpentries.org/coco_git_lesson](https://pad.carpentries.org/coco_git_lesson)
+
+---
+
+## Workflow colaborativo
+
+git pull origin main
+git add
+git commit
+git push origin main
+
+
+---
+
+Material basado en la lección desarrollada por
+[Software Carpentry](https://software-carpentry.org/):
+
+- [Control de versiones con git (español)](https://swcarpentry.github.io/git-novice-es/)
+
+- [Version Control with Git (English)](https://swcarpentry.github.io/git-novice/)
+
+---
+
+
+
+
+
+El contenido de esta presentación está disponible bajo
+
+[Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/)
+
+---
+
+
+
+# Muchas gracias
diff --git a/environment.yml b/environment.yml
new file mode 100644
index 0000000..65da3a9
--- /dev/null
+++ b/environment.yml
@@ -0,0 +1,7 @@
+name: talk
+channels:
+ - conda-forge
+ - defaults
+dependencies:
+ - python==3.8
+ - livereload==2.6.1
diff --git a/images/conflict.svg b/images/conflict.svg
new file mode 100644
index 0000000..8ab1477
--- /dev/null
+++ b/images/conflict.svg
@@ -0,0 +1,47 @@
+
+
+
\ No newline at end of file
diff --git a/images/git-checkout.svg b/images/git-checkout.svg
new file mode 100644
index 0000000..fe5599d
--- /dev/null
+++ b/images/git-checkout.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/images/git-freshly-made-github-repo.svg b/images/git-freshly-made-github-repo.svg
new file mode 100644
index 0000000..5e3e120
--- /dev/null
+++ b/images/git-freshly-made-github-repo.svg
@@ -0,0 +1,324 @@
+
+
+
+
diff --git a/images/git-staging-area.svg b/images/git-staging-area.svg
new file mode 100644
index 0000000..c74c298
--- /dev/null
+++ b/images/git-staging-area.svg
@@ -0,0 +1,93 @@
+
+
+
+
diff --git a/images/github-collaboration.svg b/images/github-collaboration.svg
new file mode 100644
index 0000000..3d02844
--- /dev/null
+++ b/images/github-collaboration.svg
@@ -0,0 +1,779 @@
+
+
+
+
diff --git a/images/github-repo-after-first-push.svg b/images/github-repo-after-first-push.svg
new file mode 100644
index 0000000..3b81855
--- /dev/null
+++ b/images/github-repo-after-first-push.svg
@@ -0,0 +1,507 @@
+
+
+
+
diff --git a/images/github.svg b/images/github.svg
new file mode 100644
index 0000000..5e2ddcb
--- /dev/null
+++ b/images/github.svg
@@ -0,0 +1,124 @@
+
+
diff --git a/images/merge.svg b/images/merge.svg
new file mode 100644
index 0000000..4aaa8a0
--- /dev/null
+++ b/images/merge.svg
@@ -0,0 +1,40 @@
+
+
+
+
diff --git a/images/phdcomics.png b/images/phdcomics.png
new file mode 100644
index 0000000..c47c428
Binary files /dev/null and b/images/phdcomics.png differ
diff --git a/images/play-changes.svg b/images/play-changes.svg
new file mode 100644
index 0000000..3118563
--- /dev/null
+++ b/images/play-changes.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/images/versions.svg b/images/versions.svg
new file mode 100644
index 0000000..12457b5
--- /dev/null
+++ b/images/versions.svg
@@ -0,0 +1,184 @@
+
+
+
+
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..2096b92
--- /dev/null
+++ b/index.html
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+
+
Chat with Less.js users and contributors
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/less/contribute)]
+
+#### Individuals
+
+
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/less/contribute)]
+
+
+
+
+
+
+
+
+
+
+
+
+## [License](LICENSE)
+
+Copyright (c) 2009-2017 [Alexis Sellier](http://cloudhead.io) & The Core Less Team
+Licensed under the [Apache License](LICENSE).
+
+
+[so]: http://stackoverflow.com/questions/tagged/less "StackOverflow.com"
+[issues]: https://github.com/less/less.js/issues "GitHub Issues for Less.js"
+[download]: https://github.com/less/less.js/zipball/master "Download Less.js"
diff --git a/pkg/less/less.min.js b/pkg/less/less.min.js
new file mode 100644
index 0000000..0ee87bb
--- /dev/null
+++ b/pkg/less/less.min.js
@@ -0,0 +1,11 @@
+/**
+ * Less - Leaner CSS v3.11.1
+ * http://lesscss.org
+ *
+ * Copyright (c) 2009-2020, Alexis Sellier in '+f+" ";var p=function(e,t,n){void 0!==e.extract[t]&&c.push('
{content}
+
+ 
+
+
+ 
+ 
+
+
+ + Created by Hakim El Hattab and contributors +
++ reveal.js enables you to create beautiful interactive slide decks using HTML. This presentation will show you examples of what it can do. +
+Slides can be nested inside of each other.
+Use the Space key to navigate through all slides.
+Nested slides are useful for adding additional detail underneath a high level horizontal slide.
+That's it, time to go back up.
++ Not a coder? Not a problem. There's a fully-featured visual editor for authoring these, try it out at https://slides.com. +
+
+
+ import React, { useState } from 'react';
+
+ function Example() {
+ const [count, setCount] = useState(0);
+
+ return (
+ ...
+ );
+ }
+ Code syntax highlighting courtesy of highlight.js.
+
+ import React, { useState } from 'react';
+
+ function Example() {
+ const [count, setCount] = useState(0);
+
+ return (
+ <div>
+ <p>You clicked {count} times</p>
+ <button onClick={() => setCount(count + 1)}>
+ Click me
+ </button>
+ </div>
+ );
+ }
+
+ function SecondExample() {
+ const [count, setCount] = useState(0);
+
+ return (
+ <div>
+ <p>You clicked {count} times</p>
+ <button onClick={() => setCount(count + 1)}>
+ Click me
+ </button>
+ </div>
+ );
+ }
+ + Press ESC to enter the slide overview. +
++ Hold down the alt key (ctrl in Linux) and click on any element to zoom towards it using zoom.js. Click again to zoom back out. +
++ (NOTE: Use ctrl + click in Linux.) +
+Automatically animate matching elements across slides with Auto-Animate.
++ Presentations look great on touch devices, like mobile phones and tablets. Simply swipe through your slides. +
+Hit the next arrow...
+... to step through ...
+... a fragmented slide.
+ + +There's different types of fragments, like:
+grow
+shrink
+fade-out
++ fade-right, + up, + down, + left +
+fade-in-then-out
+fade-in-then-semi-out
+Highlight red blue green
+
+ You can select from different transitions, like:
+ None -
+ Fade -
+ Slide -
+ Convex -
+ Concave -
+ Zoom
+
+ reveal.js comes with a few themes built in:
+
+ Black (default) -
+ White -
+ League -
+ Sky -
+ Beige -
+ Simple
+ Serif -
+ Blood -
+ Night -
+ Moon -
+ Solarized
+
+ Set data-background="#dddddd" on a slide to change the background color. All CSS color formats are supported.
+
<section data-background="image.png"><section data-background="image.png" data-background-repeat="repeat" data-background-size="100px"><section data-background-video="video.mp4,video.webm">+ Different background transitions are available via the backgroundTransition option. This one's called "zoom". +
+Reveal.configure({ backgroundTransition: 'zoom' })+ You can override background transitions per-slide. +
+<section data-background-transition="zoom">Since reveal.js runs on the web, you can easily embed other web content. Try interacting with the page in the background.
+| Item | +Value | +Quantity | +
|---|---|---|
| Apples | +$1 | +7 | +
| Lemonade | +$2 | +18 | +
| Bread | +$3 | +2 | +
+ These guys come in two forms, inline: The nice thing about standards is that there are so many to choose from
and block:
+
+ “For years there has been a theory that millions of monkeys typing at random on millions of typewriters would + reproduce the entire works of Shakespeare. The Internet has proven this theory to be untrue.” ++
+ You can link between slides internally, + like this. +
+There's a speaker view. It includes a timer, preview of the upcoming slide as well as your speaker notes.
+Press the S key to try it out.
+ + +Presentations can be exported to PDF, here's an example:
+ +
+ Set data-state="something" on a slide and "something"
+ will be added as a class to the document element when the slide is open. This lets you
+ apply broader style changes, like switching the page background.
+
+ Additionally custom events can be triggered on a per slide basis by binding to the data-state name.
+
+Reveal.on( 'customevent', function() {
+ console.log( '"customevent" has fired' );
+} );
+ + Press B or . on your keyboard to pause the presentation. This is helpful when you're on stage and want to take distracting slides off the screen. +
+