Stack Overflow
Stack Overflow

Questions tagged [git-pull]

Fetches changes from a remote repository and incorporates them into the current branch of a Git repository.

git pull is used whenever changes from a remote repository need to be fetched and incorporated into the local repository. Internally git pull first performs a git fetch to get the remote branches updated and then a git merge to incorporate the changes into the current branch.

1231 questions
17
votes
1 answer

some confusion on git pull vs git-fetch

So - can someone clarify this one: I run: git pull origin master git status And it then pulls the changes and says: your branch is ahead of origin/master ... blahblah by 6 commits... When I then run git fetch git status It says: # On branch…
Dannyboy
  • 1,963
  • 3
  • 20
  • 37
17
votes
4 answers

How do I remove git's MERGE_MSG?

I've tried a few things suggested, but nothing seems to remove it. This started occurring when I upgraded to Mountain Lion OS X. Anytime I do a git pull, it displays this annoying as heck empty editor with the title MERGE_MSG. How do I prevent that…
Trip
  • 26,756
  • 46
  • 158
  • 277
16
votes
4 answers

Git pull/fetch with refspec differences

Using refspec is a convenient way to grab a remote branch and create a similar one but with given name (or the other way round: create a remote one with a given name different from the local one). I'm puzzled about one tiny thing - as pull will also…
pielgrzym
  • 1,647
  • 3
  • 19
  • 28
16
votes
2 answers

Control Freak: Commit rejected. Foxtrot merges not allowed in Bitbucket

What exactly is the reason for Control Freak: Commit rejected. Foxtrot merges not allowed We keep receiving this error quite often, is this is caused due to a combination of pull, rebase and amend by users while committing? Need clarity to get rid…
Mithun Shreevatsa
  • 3,588
  • 9
  • 50
  • 95
16
votes
1 answer

error: cannot update the ref : unable to append to : Not a directory

My issue is not this issue. On pull, I am getting the following error- error: cannot update the ref 'refs/remotes/origin/features/name/surname’: unable to append to '.git/logs/refs/remotes/origin/features/name/surname': Not a directory Adding…
Farrukh Chishti
  • 7,652
  • 10
  • 36
  • 60
16
votes
5 answers

How to pull a pull request from upstream in github

I have forked a repo in github. There are some new pull requests in the Upstream. I want to pull a pull request from upstream locally. How can I do that? I have no idea and found nothing related to this.
Noor A Shuvo
  • 2,639
  • 3
  • 23
  • 48
16
votes
2 answers

pull command error : Failed connect to github.com:8080

I tried to pull repository so that I can merge the changes made to my repository. But while using the pull command it gives following error: $ git pull https://github.com/ShrutiRuparel/depot.git master error: Failed connect to github.com:8080; No…
Rashmi
  • 629
  • 1
  • 11
  • 35
16
votes
3 answers

Git pull hangs randomly

When using git on windows normally (such as git push and git pull), it will sometimes be very slow. Running git pull over and over again returns within two seconds most of the time, but about 1/6 of attempts take about a minute. I have set git…
usernumber
  • 541
  • 5
  • 15
16
votes
4 answers

error: The following untracked working tree files would be overwritten by merge: .DS_Store

I have a git repository on a mac, when I use git status in terminal it says On branch master nothing to commit, working directory clean when I try to pull changes from repository git pull repositoryName master error: The following untracked working…
D4rWiNS
  • 2,585
  • 5
  • 32
  • 54
16
votes
5 answers

Can I use git pull --rebase instead of "git stash git pull git stash pop"?

What is the difference between git pull --rebase and git stash git pull git stash pop
Raja
  • 161
  • 1
  • 1
  • 5
16
votes
2 answers

How can I tell what happened in a Git commit with two parents that did not merge in the changes from the second parent?

In Gitk I can see a team member's commit (X) that has two parents, the first parent is his own previous commit (A), the other parent contains lots of other people commits (1 through 5). After his merge all changes made by other people (1 through 5…
DAC
  • 707
  • 1
  • 6
  • 20
16
votes
2 answers

How to push/pull Git rebase

I'd like to use git rebase so as to cleanly merge a feature in the master branch (in less commits or at least at the top of the change log). Note that I'm the only one working on the repository. After reading Git workflow and rebase vs merge…
Wernight
  • 36,122
  • 25
  • 118
  • 131
16
votes
1 answer

Why do we need to git push first before git pull?

I have both local changes and remote changes. Someone told me I must do push first, then pull. Any reason behind this?
user496949
  • 83,087
  • 147
  • 309
  • 426
15
votes
1 answer

What are these symbols next to "merge mode by recursive" in git merge?

When I use git pull [project name] master to update my core files, I get a bunch of green plus and red minus signals under "merge made by recursive." What are these symbols and what do they mean? Here's a screenshot: Thank you for your help.
jfmercer
  • 3,641
  • 3
  • 29
  • 35
15
votes
2 answers

Git shows no merge conflicts when it should

According to my understanding of merge conflicts, a merge conflict occurs when two people have changed the same file, and/or modified the same line in that file. So when I did a git pull origin master I expected a merge conflict, since the same…
Silencer310
  • 862
  • 2
  • 8
  • 25
1 2 3
…
82 83