git - Read For Learn

Your configuration specifies to merge with the from the remote, but no such ref was fetched.?

What this means Your upstream—the remote you call origin—no longer has, or maybe never had (it’s impossible to tell from this information alone) a branch named feature/Sprint4/ABC-123-Branch. There’s one particularly common reason for that: someone (probably not you, or you’d remember) deleted the branch in that other Git repository. What to do This depends on what you want. … Read more

git add . -> still “nothing to commit” with new files

Your commands look correct (I’ve done them many times that way). First try and then try git status. I don’t think that will solve it, but worth trying next. Next try looking at your .gitignore file, if you have one (in the top level where you did git init). Remove any listings there that are causing your … Read more

How to remove a directory from git repository?

Remove directory from git and local You could checkout ‘master’ with both directories; Remove directory from git but NOT local As mentioned in the comments, what you usually want to do is remove this directory from git but not delete it entirely from the filesystem (local) In that case use:

Is there a “theirs” version of “git merge -s ours”?

A similar alternative is the –strategy-option (short form -X) option, which accepts theirs. For example: However, this is more equivalent to -X ours than -s ours. The key difference being that -X performs a regular recursive merge, resolving any conflicts using the chosen side, whereas -s ours changes the merge to just completely ignore the other side. In some cases, the main problem using -X theirs instead of … Read more

git: fatal: Could not read from remote repository

You can specify the username that SSH should send to the remote system as part of your remote’s URL. Put the username, followed by an @, before the remote hostname.

What is the point of ‘git submodule init’?

Reading the git submodule documentation, there is a use-case that ostensibly justifies the existence of git submodule init as a standalone command. If a user who has cloned a repository wishes to use a different URL for a submodule than is specified by the upstream repository, then that user can:

git checkout tag, git pull fails in branch

Edit: For newer versions of Git, –set-upstream master has been deprecated, you should use –set-upstream-to instead: As it prompted, you can just run: After that, you can simply run git pull to update your code.

git – Your branch is ahead of ‘origin/master’ by 1 commit

You cannot push anything that hasn’t been committed yet. The order of operations is: Make your change. git add – this stages your changes for committing git commit – this commits your staged changes locally git push – this pushes your committed changes to a remote If you push without committing, nothing gets pushed. If you commit without … Read more

.gitignore and “The following untracked working tree files would be overwritten by checkout”

It seems like you want the files ignored but they have already been commited. .gitignore has no effect on files that are already in the repo so they need to be removed with git rm –cached. The –cached will prevent it from having any effect on your working copy and it will just mark as removed the next … Read more

How can I rollback a git repository to a specific commit?

Note: As written in comments below, Using this is dangerous in a collaborative environment: you’re rewriting history

+ More