Essien Ita Essien 7c4185cd41 Change conflict hint depending on state of working commit. ... To avoid always printing the rebase instructions to fix a conflict even when a child commit to fix the conflict already exists, implement the following: * If working commit has conflicts: * Continue printing the same message we print today. * If working commit has no conflicts: * If any parent has conflicts, we print: "Conflict in parent is resolved in working copy". Also explicitly not printing the "conflicting parent" here, since a merge commit could have conflict in multiple parents. * If no parent has any conflicts: exit quietly. * Update unittests for conflict hinting update. * Update CHANGELOG		2024-08-01 16:21:24 +01:00
..
examples
src	Change conflict hint depending on state of working commit.	2024-08-01 16:21:24 +01:00
testing
tests	Change conflict hint depending on state of working commit.	2024-08-01 16:21:24 +01:00
build.rs
Cargo.toml
LICENSE