search

godotengine / godot-git-plugin

Git implementation of the VCS interface in Godot
MIT License
710 stars 74 forks source link

How merge a branch into main? #252

Open Roy5691 opened 2 months ago

Roy5691 commented 2 months ago

I have been using the plugin and it's great to be able to use git within the editor.

I don't use Github or any other remote git service. I use git very simply. I have my main work on 'main' and make branches to try out ideas, features, etc, and then merge these branches into main when I am finished.

I made a branch using the plugin to do some work, expecting I would be able to merge this branch into main but I can't find a 'merge' action.

I read the wiki and nothing is mentioned there.

Am I misunderstanding how merging is performed using the plugin, or is merging not possible using the plugin?

vuk-noctiluca commented 2 months ago

It doesn't seem to be possible to merge from within the editor using the addon. I had to manually merge in the file browser, then restart Godot so the addon registers the changes in the repo (without this, it will display the merged branch as if it still exists).