Marc Frame
Marc Frame
any updates on this?
@jcubic thanks for the update, I would be happy to try to implement this feature. I was looking into a fix for this and I stumbled upon this file [mergeFile.js](https://github.com/isomorphic-git/isomorphic-git/blob/main/src/utils/mergeFile.js#L5)...
@jcubic I don't think I will implement all the different merge strategies, but perhaps the following. 1. strategy `recursive` (would be very difficult for me, but I might be able...
so just by removing this line from `utils/mergeFile.js` it works in a similar way to a merge strategy resolve ``` if (!cleanMerge) { // all other types of conflicts fail...
any update on this feature?
is there an update on this?
you need to provide cookies now so I had to edit the script headers to include those. you can get those by requesting the main page. ill update this thread...
@y-so @st3r30byt3 ``` headers = { "User-Agent": "Mozilla/5.0", # "Content-Type": "application/json", "Accept": "application/json, text/plain, */*", "Accept-Encoding": "gzip, deflate, br", "accept-language": "en_US", "Connection": "keep-alive", "Content-Length": "111", "Content-Type": "application/json; charset=UTF-8", "Cookie": "XSRF-TOKEN=02c121d8-59f4-4a0a-9830-84eebd8c84cf;...
I took a crack at it, but it appears they increased security on it. If I ever have a need for this API again I'll take another look at it...
ok I figured it out it was because of a weird interaction with tailwind `drop-shadow-md`