From a825aaadabeb711e34dd074857bd7b750886809c Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Tue, 26 Oct 2021 15:52:49 -0500 Subject: [PATCH 1/4] modificacion del about me --- your-code/about-me.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 30a999d..783acb4 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,7 +1,4 @@ -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque viverra laoreet lorem et dapibus. Integer auctor dignissim egestas. Ut id purus neque. Pellentesque imperdiet lacus in libero laoreet, at tempus felis tristique. Cras fermentum erat a dui vulputate gravida. Nulla aliquet nisi interdum nulla pretium, ac vestibulum diam congue. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Phasellus lacus risus, sodales vitae viverra quis, maximus ac ipsum. Sed consequat viverra mattis. Curabitur iaculis varius mollis. -Ut porttitor iaculis tellus bibendum euismod. Morbi porta, ante nec tempus porta, felis mi faucibus lacus, sed tristique purus nunc sed est. Aenean pulvinar urna ut lacus interdum aliquam. Pellentesque sit amet magna accumsan, sagittis metus a, volutpat velit. Mauris vitae ex vehicula, posuere nisi sed, sagittis nunc. Ut scelerisque, mi non tristique tristique, mi enim luctus nunc, eu mattis sem quam auctor nunc. Donec lobortis tellus eget blandit ultricies. Vivamus euismod metus eget leo blandit, at malesuada magna efficitur. Praesent sodales faucibus mi, ullamcorper ultrices orci. Vivamus maximus malesuada massa, nec placerat leo feugiat vel. Nam vitae eleifend enim. Nullam interdum ipsum velit, vitae faucibus lectus blandit euismod. +##### Hola -Suspendisse ut malesuada ex. Nulla ultricies nisl et nisi rhoncus sollicitudin. Vestibulum maximus iaculis ligula, nec commodo nunc ullamcorper nec. Duis quis condimentum sapien. Cras vestibulum interdum felis eu auctor. Quisque semper, magna at dapibus faucibus, felis risus semper ligula, id aliquam lectus ligula vel nisi. In hac habitasse platea dictumst. Donec arcu sapien, suscipit ac dictum et, imperdiet id tortor. Maecenas ornare sodales interdum. Mauris dictum felis eu eros vestibulum cursus. Phasellus accumsan, turpis ut malesuada sollicitudin, augue leo venenatis ante, vel convallis tellus diam sit amet lacus. Aenean eu mauris eros. Praesent ante lacus, gravida sit amet tellus nec, laoreet ultrices lacus. Integer commodo semper vestibulum. Fusce felis massa, consectetur facilisis rutrum nec, pulvinar et nisi. - -Morbi fermentum ultricies tortor, vehicula ultrices eros elementum a. Duis ornare aliquam facilisis. Proin aliquam tincidunt odio vitae dignissim. Sed malesuada lacinia massa, nec blandit urna auctor elementum. Duis auctor non tortor in consequat. Mauris id vestibulum risus. In eget erat sed lacus efficitur viverra sed eu est. Aliquam interdum consequat molestie. Aliquam metus nisi, blandit non semper ut, blandit vel leo. Cras dictum turpis erat, sed iaculis ligula facilisis dapibus. Aliquam posuere dignissim fermentum. Praesent at neque sit amet lectus ornare iaculis. Curabitur id urna quis lorem varius ultrices eu sit amet sapien. Curabitur maximus volutpat suscipit. Proin imperdiet elementum lacus a eleifend. Sed tempor lacus posuere diam vehicula iaculis. +Este es un mensaje From ec997aac2c6c9c3f0760ef7ebf4dbdf88b16f834 Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Tue, 26 Oct 2021 16:50:17 -0500 Subject: [PATCH 2/4] modificacion en el master --- your-code/about-me.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 783acb4..9a3f391 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,4 +1,5 @@ ##### Hola -Este es un mensaje +Este es un mensaje about-me +erererere From 85434a6f461859b12dc4a20c25610122d7257e78 Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Wed, 27 Oct 2021 20:50:12 -0500 Subject: [PATCH 3/4] cambiando nombre --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0657f4e..a9a8178 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,7 @@ In your real work you don't create conflicting changes on purpose. But for the s ``` # Who am I + Daniel * Where are you from? * What do you do? From 84d183a343ed7dff5f5e100e5693cc4de75f421b Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Wed, 27 Oct 2021 21:22:31 -0500 Subject: [PATCH 4/4] modificando el archivo --- README.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/README.md b/README.md index 0657f4e..951c776 100644 --- a/README.md +++ b/README.md @@ -103,22 +103,7 @@ In your real work you don't create conflicting changes on purpose. But for the s Below is a template you can use to introduce yourself: ``` - # Who am I - - * Where are you from? - * What do you do? - * Do you have previous experience with technology/data? - - # Why am I here - - * What has brought you to Ironhack? - * What knowledge/skills do you expect to learn in this bootcamp? - - # What will I do after the bootcamp? - - * Which industry will you seek employment in? - * What will your future role look like? - * What is your career goal? + # Daniel Gonzalez ``` 1. Now, add the updated `your-code/about-me.md` file to git and commit and let's assume the ID of the new commit is `338cc201764793e1896744e8fd575e3c09c97a09`. Now execute `git pull origin master` and Git will report you have a conflict that prevents you from merging the branches. Your Git tree currently looks like below.