tap: detect merge conflicts tool

mika / jenkins-debian-glue

Scripts for Debian package/repository handling inside Jenkins

MIT License

131 stars 91 forks source link

Closed linuxmaniac closed 10 months ago

linuxmaniac commented 1 year ago

detect if file has git merge confict markers

linuxmaniac commented 1 year ago

what about this one? Maybe the grep command con be improved

linuxmaniac commented 10 months ago

ping @mika

mika commented 10 months ago

@linuxmaniac sorry for the delay, nice one - thanks! :+1: