Skip to Main Content

Java Development Tools

Announcement

For appeals, questions and feedback about Oracle Forums, please email oracle-forums-moderators_us@oracle.com. Technical questions should be asked in the appropriate category. Thank you!

JDeveloper 12c Git Branch Checkout Results with Errors Without pending Changes

Alex WalworthOct 14 2016 — edited Oct 15 2016

Hello,

I'm using JDeveloper 12.2.1.1.0 and am trying to checkout a different local branch but am consistently given the error that there are conflicts during checkout. I've seen this before when I have pending changes, but as you'll see in my screen shots I have zero pending changes and all commits have been pushed. The error that gets sent to me is unhelpful and the only solution I've found is to completely wipe out my local code and check it out again. Is there anyone who's found the reasoning to this or knows a more acceptable workaround?

Thanks,

Message was edited by: Alex Walworth

Comments
Locked Post
New comments cannot be posted to this locked post.
Post Details
Locked on Nov 12 2016
Added on Oct 14 2016
3 comments
702 views