Hi, I ran git import-orig --pristine-tar --uscan and it resulted in a merge conflict in spec/spec_helper.rb. How should i proceed to resolev the merge conflict as the change will be in the upstream's files.
-- Nitesh A Jain -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/CAC1A26L+in_A_Kkg7BJ8TtdVqRPrX6UbH_0=_q4dv_w2pwk...@mail.gmail.com
