FAQ Database Discussion Community


Why can't “Git pull” pull all the branches from remote repo

git,git-pull,pull
I have a question about "git pull". Suppose I have a two remote branches "master" and "new_branch", when I use "git pull" and then use "git branch", only the "master" is shown. Why I can't see the "new branch"? I have to use "checkout new_branch" to get it shown on...

Git pull from production server without direct server access

git,git-pull
We've been granted access for development to a client's remote repository (CodebaseHQ) but due to an entry in .gitignore, there is a directory that does not exist in the remote repo. I've modified the .gitignore (removing the necessary entry) and pushed this to the remote repo but is there anyway...

git push origin master error: The following untracked working tree files would be overwritten by merge: .DS_Store

git,bitbucket,git-branch,git-push,git-pull
It's been a while that I am facing the following problem. What's the fix to it? I am just a newbie in git so please be instructive. I have already tried to follow the commands shown in the error but wasn't successful. Monas-MacBook-Pro:demo mona$ git branch * master Monas-MacBook-Pro:demo mona$...

GIT: `error: unable to find ` and `fatal: object not found` on pull

git,bitbucket,git-pull
We have a repo in Bitbucket, which we use as a central repo: we update it via pull requests or directly by pushing changes, and we synchronize the last changes in remote servers by pulling from it. This has been working like a charm for about a year, but now...

git: auto stash with “git pull”

git,git-pull,git-stash
I know how to solve this: [email protected]$ git pull Updating 9386059..6e3ffde error: Your local changes to the following files would be overwritten by merge: foo.bar Please, commit your changes or stash them before you can merge. Aborting But ain't there a way to let git pull do the stash and...

GIT pull, moved filles locally

git,github,git-pull
I'm very new to git. And I was doing a git pull from a remote server. First, let me explain my situation. I have two folders that I've set app and app.my. Both of this folders are within myApps folders. I use app to clone my remote repository and is...

git reset [email protected]{1} not removing files that were added?

git,github,git-pull
does git reset [email protected]{1} not remove files that were added from git pull? What I did. I used git pull. Got newest source code. Then found out that code was not good and wanted to restore my code to previous state, so I did git reset [email protected]{1}. It restored back....

Android studio git message: following untracked working tree files would be overwritten by merge, but not showing which files

android,git,git-pull
I'm working on an android project in android studio and using VCS for working on git with the other members of the team. Last time I tried to pull from origin, the following error came up: "following untracked working tree files would be overwritten by merge", but it doesn't show...

Does git truncate files when pulling from a remote?

git,git-pull
I have a web server running Apache and PHP. I want to know if Git interrupt access to files during a pull process.

Git, non-fast-forward issue on master when working on a branch

git,git-branch,git-pull
I am working on an branch, let's say it's branch1.1. I make several changes and just use 'git commit' to commit those changes. Then as I usually working on master, I do an git push to check in them. However such errors occurs: To [email protected]:flt/test.git ! [rejected] master -> master...

Is `pull` needed after checking out a new branch?

git,git-pull,git-checkout
In case of a git-project with several branches, the question is when you checkout a new branch (first time), is a git pull needed ? $master> git checkout branchA $branchA> git pull Note that the idea here is that both commands are executed right after each other (this question is...

How does Git determine what objects need to be sent between repositories?

git,git-push,git-pull,git-fetch
I have looked here but couldn't quite figure out the things I was wondering about: how does git push or git pull figure out what commit objects are missing at the other side? Let's say we have a repository with the following commits: (letters stand in for SHA-1 IDs, d...

Should I do git fetch before pull if branch exists locally?

git,version-control,git-pull,git-fetch
I have following question about git. I novice with git. I want to get last state of branch1 locally. now I switched on branch2 and branch1 exists locally. Now I make fetch switch to branch1 pull Please clarify me whether does first fetch redundant or not?...

git pull command output message meaning into which branch

git,git-branch,git-pull,git-remote
Say there is a remote branch br1 checkout on the remote repo, and the master branch on a local repo. Command 1: If I do a "git pull origin br1:br1" it pulls remote br1 into local br1, and shows: 9188a5d..97d4825 br1 -> br1 9188a5d..97d4825 br1 -> origin/br1 command 2: If...

git pull U, A and D tags: Meaning?

git,github,version-control,git-pull
git pull occasionally will give me messages as follows: I do not understand the tags of "U", "A", and "D". Can someone please tell me what these mean? Thanks....

git pull complains about overwrite even after removing those files on remote repo

git,git-pull
My friend accidentally added some obj files on to our remote repo. Now, on my machine, when I tried to do git pull, it complained that these .o files would overwrite mine locally. As those are unnecessary files, I did git rm --cached on every file that git pull complained...

How to unmerge a Git merge?

git,github,merge,git-pull
I accidentally did a git pull origin master from dev, and master got merged into dev. Is it possible ? I've already seen different solutions, i tried this one from both dev and master : git revert -m 1 <commit> (once each) But i got : Everything is up-to-date, each...

Difference between checkout remote branch and pull remote branch in git?

git,merge,git-pull,git-checkout
What is the difference between: git checkout -b <branch> origin/<branch> and git pull origin <branch> They seem to have the same functionality to me. thanks....

Pull Button for git disabled in VisualStudio

git,visual-studio,visual-studio-2013,git-pull,pull
I'm using VisualStudio 2013 Update 4 and have git for Windows installed. I have local git repository and my project is linked to. I can push unsynced commits to remote repository in the IDE, but button for pull and fetch are disabled. In git bash i can pull (or fetch)...

Setting where a local git branch pulls AND pushes

git,git-branch,git-push,git-pull
I am working on my forked repo with 2 main branches: master: pulls from main_project/master bootstrap: pulls from collaborator/bootstrap The second remote is a fork also contributing to the main project I want the above branches to pull from the respective related repos; however, I want them to push to...