Git: file can't be reverted or resolved

This forum is for all Flare issues related to using Source Control.

Git: file can't be reverted or resolved

Postby oceanclub on Thu Apr 18, 2019 12:07 pm

I have no local changes to a particular file:

Image

Yet when I try to check it in, I’m told there is a conflict.

Image

When I try Auto-Merge, I get the following error:

Image

When I try “Resolve…” nothing happens (I see a dialog box briefly appear then disappear)

So:

• I can’t revert the file
• I can’t auto-merge it
• I can’t resolve it

What do I do here?

Regards,

Paul
User avatar
oceanclub
Sr. Propeller Head
 
Posts: 223
Joined: Thu Oct 10, 2013 4:45 am
Location: Dublin

Re: Git: file can't be reverted or resolved

Postby Gecko on Sun Dec 15, 2019 3:44 pm

BUMP

A question 6 years old, and still a problem in 2019. I'd rather not have to delete my local every time
Gecko
Jr. Propeller Head
 
Posts: 2
Joined: Sun Jul 14, 2019 8:28 pm

Re: Git: file can't be reverted or resolved

Postby corinne67 on Mon Dec 16, 2019 8:48 am

Any solution to this. I am facing the same issue and right now I cannot pull the latest version of the file from Central.
corinne67
Jr. Propeller Head
 
Posts: 4
Joined: Fri Mar 01, 2019 9:44 am
Location: San Antonio


Return to Source Control

Who is online

Users browsing this forum: No registered users and 2 guests