feature: show commit lists in merge and rebase in a table

This commit is contained in:
jt
2026-09-26 17:38:05 -03:00
parent 8ba5f8f5da
commit 67eb6fb6d1
3 changed files with 53 additions and 18 deletions
+1 -9
View File
@@ -71,15 +71,7 @@ def run_local(branch: str, target: str):
def show_commits_to_merge(target):
commits = Git("log", target + "..", format="%s").lines()
if not commits:
raise GitFlowError("No hay cambios a mergear.")
print("Cambios a mergear:")
for commit in commits:
print("- " + commit)
base.show_commits("Cambios a mergear", target + "..")
def check_merge_conflicts(target: str):