Skip to content

Conversation

@Lestropie
Copy link
Member

This seems to have been changed in 439dca7, but is causing all sorts of issues when branch hopping; the file keeps getting flagged as changed, and doesn't resolve through a checkout or even a stash.

@Lestropie Lestropie merged commit ea8a333 into master Jun 16, 2020
@Lestropie Lestropie deleted the fix_mrview_sync_enums branch June 16, 2020 06:01
@jdtournier
Copy link
Member

Just came across this issue. It's driving me nuts... The file still shows with changes after a git reset --hard, and consequently I can't even merge the fix because my local 'changes' would be overwritten by the merge. Rate of hair loss rapidly increasing...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants