Scoop: Error when updating scoop (java bucket)

[DesigningKnights]

I get the following message when I try to update

error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

[Ash258]

Java bucket? I am experiencing same.

[r15ch13]

Yeah, @se35710 merged something wrong I guess. Just remove it and add it again.

[Ash258]

/cc @se35710
There are some merge conflicts happening. (Haven't edited anything in local bucket)
scoop bucket rm java; scoop bucket add java Helped

[se35710]

Yes, I made a mistake a couple of days back, messing up the git history. I thought I fixed it though, but it seems like I did not.

Removing and adding the java bucket should fix it, eg:

PS C:> scoop bucket rm java
PS C:> scoop bucket add java

I have replaced the master branch with a new one. Running the rm/add commands above will clone from the new branch.

I am very sorry for the inconvenience.

[Ash258]

Could be closed.