=== chihchun_afk is now known as chihchun
=== maclin1 is now known as maclin
=== LocutusO- is now known as LocutusOfBorg
=== chihchun is now known as chihchun_afk
=== chihchun_afk is now known as chihchun
[13:25] <ahasenack> hi, I could use some assistance with a git MP in LP. The diff it's showing me seems incorrect
[13:25] <ahasenack> this is the mp: https://code.launchpad.net/~ahasenack/ubuntu/+source/ubuntu-advantage-tools/+git/ubuntu-advantage-tools/+merge/337213
[13:25] <ahasenack> and let me highlight one of the incorrect things
[13:25] <ahasenack> debian/rules (+6/-0) <-- it's saying that debian/rules is a new file
[13:25] <ahasenack> but it's not, it exists already: https://git.launchpad.net/~usd-import-team/ubuntu/+source/ubuntu-advantage-tools/tree/debian/rules
[13:26] <ahasenack> many other files in debian/ are misrepresented like that in the diff
[13:32] <ahasenack> "git diff bionic-version-14..ubuntu/devel -- debian/rules" shows the correct diff
[15:32] <cjwatson> ahasenack: Conceivably bug 1609972, although I don't see a modify/delete conflict here so probably not.  I'm on leave today so won't investigate in detail.  Could you file a bug report about this on the turnip project, please?
[15:32] <ubot5> bug 1609972 in turnip "Git merge proposals silently show no diff if there are conflicts?" [High,In progress] https://launchpad.net/bugs/1609972
[15:37] <ahasenack> cjwatson: will do
=== chihchun is now known as chihchun_afk