search

geut / chan

A Changelog CLI based on http://keepachangelog.com/
ISC License
87 stars 10 forks source link

Git merge driver #12

Closed brook-seaton closed 3 years ago

brook-seaton commented 6 years ago

If this had a merge driver for git to automatically resolve merge conflicts, that would be great.

dpaez commented 6 years ago

Hi, @brook-seaton 👋 Thanks for using chan!

Regarding the issue, do you have any example use case for a merge driver in chan? or in changelog resolution, I think? The merge driver concept is new, at least to me, and sounds interesting for chan but need more info. Maybe you have something in mind.

Thanks in advance!