From 3f353a2f628ba4a68c26940b60c4dd249062dd7e Mon Sep 17 00:00:00 2001 From: pabl0n Date: Tue, 13 Jan 2026 20:48:28 -0300 Subject: [PATCH 1/6] se cambio el feature.txt --- feature.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature.txt b/feature.txt index c06aff5..5ad3449 100644 --- a/feature.txt +++ b/feature.txt @@ -1 +1 @@ -nueva funcionalidad agregada VERSION REBASE +nueva funcionalidad agregada VERSION 20260113 From cb8ba33ea695893c7236331c57c7703a42673fbe Mon Sep 17 00:00:00 2001 From: pabl0n Date: Tue, 13 Jan 2026 22:03:42 -0300 Subject: [PATCH 2/6] commit nuevo en main para practicar rebase --- feature.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/feature.txt b/feature.txt index 5ad3449..25f52d5 100644 --- a/feature.txt +++ b/feature.txt @@ -1 +1,2 @@ nueva funcionalidad agregada VERSION 20260113 +cambio en main From 369af2dff1299ee5de07b50b4796a5e2d5de6d4b Mon Sep 17 00:00:00 2001 From: pabl0n Date: Tue, 13 Jan 2026 21:17:55 -0300 Subject: [PATCH 3/6] cambie el index2 --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 3ecede6..1cd35a5 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - hello login + hello login newwww From 95dc27f5b36842789b8f1068d121dd7f9151ee3d Mon Sep 17 00:00:00 2001 From: pabl0n Date: Tue, 13 Jan 2026 22:12:41 -0300 Subject: [PATCH 4/6] main modificado feature.txt --- feature.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/feature.txt b/feature.txt index 25f52d5..b1b85b9 100644 --- a/feature.txt +++ b/feature.txt @@ -1,2 +1,3 @@ nueva funcionalidad agregada VERSION 20260113 cambio en main +cambio para rebase From 1f3b393a08aeb8f45eaa4af06e3c89c26d3695c6 Mon Sep 17 00:00:00 2001 From: pabl0n Date: Tue, 13 Jan 2026 21:17:55 -0300 Subject: [PATCH 5/6] cambie el index2 --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 3ecede6..1cd35a5 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - hello login + hello login newwww From 2f2a1884e9f3d60f255fef54db3bbcb48678a6b3 Mon Sep 17 00:00:00 2001 From: pabl0n Date: Tue, 13 Jan 2026 22:13:44 -0300 Subject: [PATCH 6/6] feature modifica feature.txt --- feature.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/feature.txt b/feature.txt index b1b85b9..ce5080e 100644 --- a/feature.txt +++ b/feature.txt @@ -1,3 +1,7 @@ nueva funcionalidad agregada VERSION 20260113 cambio en main -cambio para rebase +rebase arreglado + + + +