Unity check in not working

[alpine phoenix]

Can't get new changes (Incoming Changes) because you need to checkin the current merge first. You can checkin your changes to a new branch or alternatively merge from the last changeset of the current branch

how do i check in my changes?

[alpine phoenix]

I received this error when trying to do so

[slow flume]

Undo the subtractive merge first.

[alpine phoenix]

how do i undo it?

undo doesnt do anything to it

[slow flume]

What are the changes in that changeset?

[alpine phoenix]

41

42

[alpine phoenix]

there have been more pushes after 42

but incoming changes show nothing except the error

[slow flume]

The client built-in into the editor might be making it difficult, so maybe use the standalone GUI client.

The issue is likely that the changeset includes adding and removing files. Pressing undo wouldn't revert these changes by default iirc.

[alpine phoenix]

well it would be my first time using the standalone

doing the previous things that ive tried and with no success