Relative Content

Tag Archive for gitvisual-studio-code

Created a branch and commit off wrong base branch

There exists a master branch and develop branch. They both have a different sets of commits. (I think I’m right to say that these branches have diverged) I accidentally created a feature branch off of the develop branch, made a commit, and pushed it to the remote repo. In this case, the code changes from the previous commits on master and develop do not affect the commit on the feature branch, so I should be able to move these code changes onto the master branch. How would I go about doing this in a proper git way?

Why are my git source control options different? Theres no options to set remote on my current version and I can’t figure out why

So I’m trying to get my version control to work properly, yet for some reason I’m getting different options to what I typically experience when using visual studio code. I have git installed and it appears to be fully functional. I have the extension installed as well. Yet for some reason I’m getting a seemingly different set of options with no button to set remote repository.

VSCODE: changes during merge shown as block

I am trying to address merge conflicts, and in some of my files, instead of showing each change as a discrete change where I can accept incoming, accept current change etc… it’s showing the changes as one big block. i.e. when I open VSCODE for certain files, it shows my current changes as all of the current code, and the incoming changes are the entire source file duplicated and presented as one massive change. Essentially it makes it so that I can either accept my file in its entirety or theirs. Why is this happening? It doesn’t happen to all the files. Other files still show each change discretely and give me the option of how to deal with each one.

Jetbrains’ IDE-like GIT experience plugin for VSCode?

Would you know to recommend a plugin for VScode for GIT repositories on par with Jetbrains’ IDEs functionality? I use both, and I like both, but missing seamless and user-friendly GIT experience in IDEA when working with VScode. Tried GitLens and other.