Category "git"

How can I deal with this Git warning? "Pulling without specifying how to reconcile divergent branches is discouraged"

After a git pull origin master, I get the following message: warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squ

Git mergetool with Meld on Windows

In Linux, my favorite merge tool is Meld, and I've had no problems using or configuring it to work with Git. However, in Windows it has been a different story.

How can I stash only staged changes in Git?

Is there a way I can stash just my staged changes? The scenario I'm having issues with is when I've worked on several bugs at a given time, and have several uns

Using vim as git difftool

I've configured Vim as git difftool in .gitconfig [diff] tool = vimdiff If there are changes in N files, i have to close vim (:qa) to see the next diff.

Visual Studio 2022 git error Unable to negotiate with {0} port {1}: no matching host key type found. Their offer: ssh-rsa

After updating VS 2022 to 17.1.1, I have a problem with Git. I can't comment, for example, fetch or pusl. I get a message Fetching from origin Unable to negoti

git reset asks 'more?'

Git windows command line, version 1.8.0 I have 3 commits so far and when I type git reset --soft HEAD^ new line comes up with More? and flashing cursor f

How to get Jenkins to perform deletes on remote server

I am trying to get started with an automated build process using Jenkins. So far i have managed to get Jenkins to build a project from BitBucket, run tests an

Git on OSX hangs on each command: How to fix it?

I am running mac osx lion. My problem is that git hangs after I type in each command. If i type in git then I get Usage: git credential-osxkeychain <get|s

Git global core.fileMode false overridden locally on clone

Reading this, I was able to configure both globally and locally my fileMode config to false. However, when I git clone, git keeps initializing the projects wit

git: fatal: Could not read from remote repository

I am trying to set git up with http://danielmiessler.com/study/git/#website to manage my site. I have gotten to the last step in the instructions: git push we

Visual Studio Code cannot detect installed git

Visual Studio Code reports "It look like git is not installed on your system." when I try to switch to the git view. I know I have git installed and used by oth

Pushing Project to Github using Git on Windows

I am trying to push my django project to Gihub I have installed Github for windows and Git CLI and followed all the steps First created a Repo on github wi

Impossible to merge branch: refusing to merge unrelated histories

I did create a remote repo ('myRepo') on Git. I checked the checkbox 'add a READ.me', which also make a commit on this 'myRepo' repo. Then I create a new folde

Error with DVC on Google Colab - dvc.scm.CloneError: Failed to clone repo

I'm having a problem trying to run "dvc pull" on Google Colab. I have two repositories (let's call them A and B) where repository A is for my machine learning c

error: cannot run ssh: No such file or directory when trying to clone on windows

I am trying to clone a remote repository on Windows, but when I did this: git clone [email protected]:organization/xxx.git I got this error: error: cannot run ssh

How to change the Tagger name and email of a Git Tag

Long story short I'm writing a script to migrate a very large project from (gasp) Microsoft SourceSafe to Git and I'm trying to retain the authors of the Source

git push is very slow for a branch

We have a git repo that is quite large (ios app resources). I appreciate that git is going to be slow when working with it, but if I create a new branch and edi

neovim/nvim tree doesn't open current directory only the parent directory with git

If I have a parent directory that has git and a bunch of sub directories and I cd into one of the sub directories and launch neovim, neovim/nvim tree would sho

gitignore doesn't ignore .suo Visual studio file

I want to do simple thing, ignore .suo file and bin and obj folders from committing to git repo. I've created .gitignore file and it's working for bin and obj f

git - how to get default branch?

My team alternates between usage of dev and master as default branch for several repos and I would like to write a script that checks for the default branch whe