Skip to content

Conversation

@ereslibre
Copy link
Collaborator

Improves error handling in the merge command by simplifying the commit process and ensuring proper exception propagation. The previous implementation could silently fail during commits, leading to incomplete merges.

Closes #178

Changes

  • Simplified addAndCommit() method in Git class to throw exceptions directly instead of returning boolean success/failure
  • Updated merge command to use try-catch for commit operations with proper error handling
  • Removed boolean return logic that could mask underlying git commit failures
  • Improved error reporting when workspace commits fail during merge process

Notes

This change makes the commit process more reliable by ensuring that any git failures are properly propagated as exceptions rather than being silently converted to boolean values. The merge command now provides clearer feedback when commit operations fail.

@ereslibre ereslibre self-assigned this Sep 22, 2025
@ereslibre ereslibre force-pushed the rover/task-44-2FyqdceYCfVO branch from d7102a1 to 88a26c3 Compare September 22, 2025 14:59
@ereslibre ereslibre force-pushed the rover/task-44-2FyqdceYCfVO branch from 88a26c3 to c296578 Compare September 23, 2025 06:46
Copy link
Contributor

@Angelmmiguel Angelmmiguel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM @ereslibre !

@ereslibre ereslibre merged commit 9fa8466 into main Sep 23, 2025
4 checks passed
@ereslibre ereslibre deleted the rover/task-44-2FyqdceYCfVO branch September 23, 2025 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Failed commits don't stop the push process

3 participants