mergeconflict.love
// Zoe & Michael
// Two branches, one destination
const
life
= {
branch1
:
Zoe
,
branch2
:
Michael
,
status
:
'merged'
<<<<<<< HEAD
};
// Conflict resolved with love
git
merge
--strategy=love
✓
Auto-merged
mergeconflict.love
✓
No conflicts
>>>>>>> main
// About us
function
about
() {
return
{
type
:
'nerds'
,
hobbies
: [
'code'
,
'coffee'
,
'cats'
],
status
:
'available for adventures'
};
}