Haga lo que hicimos en aula

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main) $ git log commit 780da65ae9c5f5961442d1906c7ce67b36a0da72 (HEAD -> main, origin/main) Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 22:54:37 2023 -0500

first commit

commit 0625c942e968c49bea8eccafc2c893aa3832ca7a Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 22:51:17 2023 -0500

nombrando nuevo curso productividad

commit b53f0f50f8daa5ffbb3c5ebab00e3373653d85fe Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 22:33:22 2023 -0500

se agrego gitignore

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main) $ git checkout titulo Switched to branch 'titulo'

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (titulo) $ git log commit f09ee17f9a00273b939d24c5c799e587e1a80ddc (HEAD -> titulo) Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 23:04:40 2023 -0500

se agrego nuevo titulo

commit 780da65ae9c5f5961442d1906c7ce67b36a0da72 (origin/main, main) Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 22:54:37 2023 -0500

first commit

commit 0625c942e968c49bea8eccafc2c893aa3832ca7a Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 22:51:17 2023 -0500

nombrando nuevo curso productividad

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (titulo) $ git checkout main

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (lista) $ git log commit 214428f7da4f3655b12f063fa9001a2ca3b5dbea (HEAD -> lista)Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 23:07:50 2023 -0500

se agrego nuevo curso de kubernetes

commit 780da65ae9c5f5961442d1906c7ce67b36a0da72 (origin/main, main) Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 22:54:37 2023 -0500

first commit

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main) $ git merge titulo Updating 780da65..f09ee17 Fast-forward index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main) $ git merge lista Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result.

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main|MERGING) $ git merge titulo error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict.

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main|MERGING) $ git add .

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main|MERGING) $ git status On branch main Your branch is ahead of 'origin/main' by 1 commit. (use "git push" to publish your local commits)

All conflicts fixed but you are still merging. (use "git commit" to conclude merge)

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main|MERGING)

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main) $ git log commit 0f92ecebf03982fdef2878655bbb465baebf9090 (HEAD -> main, origin/main) Merge: f09ee17 214428f Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 23:14:11 2023 -0500

cambios de la rama titulo

commit 214428f7da4f3655b12f063fa9001a2ca3b5dbea (lista) Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 23:07:50 2023 -0500

se agrego nuevo curso de kubernetes

commit f09ee17f9a00273b939d24c5c799e587e1a80ddc (titulo) Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 23:04:40 2023 -0500

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main) $

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main) $ git checkout lista Switched to branch 'lista'

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (lista) $ git add .

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (lista) $ git commit -m "se agrego curso de react js" [lista c3676e0] se agrego curso de react js 1 file changed, 1 insertion(+)

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (lista) $ git checkout main Switched to branch 'main'

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main) $ git log commit f29e1bdd9a578c2bbc642485fce5b55e78582f17 (HEAD -> main) Merge: 0f92ece c3676e0 Author: Ellisvelandia eyis619l@gmail.com

eyis@DESKTOP-6N2S1PQ MINGW64 ~/Desktop/git (main) $ git log commit f29e1bdd9a578c2bbc642485fce5b55e78582f17 (HEAD -> main, origin/main) Merge: 0f92ece c3676e0 Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 23:18:04 2023 -0500

cambios desde la rama lista

commit c3676e043a919707189bf343c1b0b7cb25e6a0be (lista) Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 23:17:20 2023 -0500

se agrego curso de react js

commit 0f92ecebf03982fdef2878655bbb465baebf9090 Merge: f09ee17 214428f Author: Ellisvelandia eyis619l@gmail.com Date: Fri Apr 7 23:14:11 2023 -0500