Glossary Git / Term
The action of fixing up manually what a failed automatic merge left behind.
Permanent link resolve - Creation date 2023-07-26