https://github.com/naopeke/reto1.6git-2

reto1.6git-2
https://github.com/naopeke/reto1.6git-2

Last synced: about 2 months ago
JSON representation

reto1.6git-2

• Host: GitHub
• URL: https://github.com/naopeke/reto1.6git-2
• Owner: naopeke
• Created: 2023-10-24T11:35:47.000Z (about 1 year ago)
• Default Branch: master
• Last Pushed: 2023-10-24T14:01:17.000Z (about 1 year ago)
• Last Synced: 2023-10-24T14:32:41.981Z (about 1 year ago)
• Language: JavaScript
• Size: 1.95 KB
• Stars: 0
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: Readme.md

Awesome Lists containing this project

README

        
Reto4 punto3

Readme.md - commit comment : committed Readme.md

.gitignore, index.js, package.json, run.js - commit cooment : commited.gitignore

porque he hecho "git add ." que aplica todos los que no han hecho "commit".

Reto5 punto6

Rama1 branch is merged with master branch. Rama2 branch is merged with master branch, too.

The commit comment of master branch is reflected to Rama1 branch and Rama2 branch.

Ha occurrido un conflicto entre ellos. En index.js, eliminar suma y añadir la suma de 3 parametros. En run.js, eliminar suma y añadir la suma de 3 parametros. Borra comentarios y resuelva el conflicto.