Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Merge branches in with Git using VS Code (not working!)

I'm working on a project with a few different branches and I began using Git in VS Code to make things easier and remain in my text editor (I know I can bring in a command line in VS Code but I'm a visual person and prefer the extension).

For the first time today it was time to merge a branch I call "features" into my master. I use the command "Git: merge branch". It does a quick load and then nothing else happens. I switch branches and nothing has merged. I have read through the VS Code documentation and there is nothing on this as well as searched through different threads here but I can't find anything that relates to this. Does anyone know how to fix this? Or am I missing something super basic??

like image 381
carlstrom96 Avatar asked Oct 26 '25 17:10

carlstrom96


1 Answers

Check the Git History VSCode plugin in order to have a visual representation of what is going on: when a merge does not yield the expected result, you must see the logs of all the branches and check how said branches are related one to another.

merged branches

Typically, if one branch was already merged into another (as shown above), trying and merge it again won't do much (meaning it will be a nop)

like image 183
VonC Avatar answered Oct 29 '25 07:10

VonC