@denyncrawford I think the issue might be that your git repo is stuck in the midst of a merge as you noted above. If you run git status in the console the resulting message will probably tell you as much. To get out of that situation, run git merge --abort in the console and you’ll abandon your merge and can start again.
Let us know if this helps, and happy Glitching!
@cori Yep that was the problem… but I just couldn’t get out the repository stuck by running git merge --abort, this error kept repeating in cycles every time I wanted to run git merge, the solution was to create a new project and clone it in a local repository, then I did git add / commit with the files from my old repository and then I pushed it to my secondary branch in the new project and finally… I was able to merge the branches, basically I cloned the project to a new one, but I had problems with a library because it seemed that my original project was still alive, even after deleting it, do you know why this happens?
Hey @denyncrawford I’m not really sure what you mean by
or how that would cause problems in another library, but let me offer this clarification: when you delete your project we only soft-delete it so you can get it back if you want. We also cache the old address when you rename a project so that your project is accessible at both addresses for a while, although we have a task in our backlog to remove that functionality.
I’m also confused as to why the git merge isn’t working better for you. It’s not the way that we expect most people to work with their projects, but we want advanced users to be able to use the tools they’re comfortable with. If you’re willing I’d love to know more about your whole workflow and how you were getting to where your merges were failing.
Corrected!
Well, I’m working with Telebot, it’s a library that requires an access token to use its HTTP API, this token gives you access to your Telgram bot and if it is repeated in different projects, the console displays an error message indicating that it’s not possible to use one token in two different projects, which means that after deleting the original project, it seemed to be still live, what I did was create another bot to get another token, and that’s it.
I’m really going to try to be more careful, probably everything was a mistake created by myself.
Well, I really do not remember at what point I started to see the problems, but for now everything is fine!
Thanks for your time @cori !
Hi,
ok I think I have the same problem. I just can’t merge my dev branch into the master with the following error:
$ git merge dev
error: insufficient permission for adding an object to repository database .git/objects
fatal: git write-tree failed to write a tree
Here is the project: https://glitch.com/edit/#!/capricious-manatee
@cori also stuck here. First merge worked, more changes then second merge failed.
Hi @voltagex, welcome to the Glitch Forums!
It looks like your repo is all in order now; are you still seeing problems?
I have the same problem with the editor on my project “mentoring-graph”. Strangely though, the live site is on the version I cannot merge.
