Question by
unity_vVZc-PQLVkDP-w · Oct 03, 2020 at 02:32 PM ·
unity 2dgithub
Couldnt locate merge tool to handle extension tmp in ....
Hi guys,
I'am working on unity project with my friend and we are using github. Once my friend uploaded some change that added dialogs and some more things. I pulled it and some files were missing, but i didnt know it. Then I worked i pushed some commits and then I realized it. So I wanted to reverse the commit with dialogs, but every time i try it it tells me this:
I tried to search some advice on the internet, but i failed... The commit was really big and he works on it very long time. I dont know what to do help....
capture.png
(16.9 kB)
Comment
Your answer
Follow this Question
Related Questions
How to GitHub your project? 0 Answers
Infinite background on 2d game without using quad 0 Answers
Targeting Player when Zooming Camera 0 Answers
m_size < k_reference_bit error 0 Answers