Git merge drivers

• 08 January 2023
• driver,
• git,
• merge,
• merge-driver

When merging you can use different drivers. Normally GIT is not sure how you want to merge rows if you have changed something and the origin also has the file modified. However, there are cases when you can define special rules. For example, if you have csv files it might be that most of the new lines should be kept from both parties; origin and local.

Reference

• Previous: Git Log
• Next: Javascript Array Reduce