Stack Overflow
Stack Overflow

Questions tagged [pull]

In distributed version control, pull or fetch is the action of transferring remote changes into a local repository.

In distributed version control, pull or fetch is the action of transferring remote changes into a local repository.

Examples:

970 questions
12
votes
1 answer

git pull merges automatically

I've a master branch and a feature_swap branch. I want to continue working on these two branches in parallel. I did some change on master and then committed. I wanted to apply some algorithm changes of master to feature_swap branch and see how that…
Dipro Sen
  • 4,350
  • 13
  • 37
  • 50
11
votes
1 answer

git pull --rebase resolve conflicts by keeping local changes

I rebased to master on my local branch. Meanwhile someone did changes on this branch on remote. I am doing git pull --rebase. I don't understand how git interprets this command when it comes to the naming of current and incoming, as well as ours and…
Peter S.
  • 315
  • 2
  • 14
11
votes
3 answers

Pull request from a different repository

I didn't know how forks and clones work. So in order to copy someone else's repo and work on it, I downloaded the repo's files (using no source control), created my own new repository, and then committed those files to it. I want to pull request my…
omer mazig
  • 965
  • 2
  • 10
  • 17
11
votes
5 answers

How to resolve git pull conflicts in xcode ui

I am using the Xcode repository GUI with the latest version of Xcode instead of the command line. I did an initial pull of the rep without a problem. I made some changes to the local files. At the same time, my other developer made some changes. I…
Greg Svitak
  • 485
  • 1
  • 6
  • 19
10
votes
3 answers

git pull: Not possible to fast-forward,

could you please help me to solve my issue? Error occurs when I try to pull from "dev" branch. I browsed the solution and it says that I need to "rebase" but it didnt work out foe me. CT+aohc@MP1GYWQA MINGW64 /c/TCO/source/RAPMD.Web.Frontend…
GGotchaA
  • 165
  • 1
  • 1
  • 10
10
votes
3 answers

git branch continually getting recreated on pull

I have a git branch that continually gets 'recreated' with an alternating letter case every time I perform a 'git pull'. Assuming the branch name is 'a' (or 'A' for all I know), one 'git pull' will produce the line: * [new branch] a ->…
acoward
  • 240
  • 3
  • 8
10
votes
2 answers

show fetched commits after git pull --rebase

Is there a way to see what commits have been pulled in from the remote repository after you do a git pull --rebase? In other words: git pull will show a summary of changed files at the end (like git diff --stat). Git pull --rebase does not. How can…
Q-BiC
  • 153
  • 1
  • 7
10
votes
2 answers

Xcode says "Uncommitted Changes" Whenever I try to git pull or push

I am using git in my projects, whenever I try to pull from Xcode I get "Uncommitted Changes" and it prevents me from pulling/pushing. I try to commit and find one file with extension *.xcuserstate, this file is modified whenever I open/scroll into…
Muhammad Hassan Nasr
  • 2,718
  • 3
  • 18
  • 20
9
votes
2 answers

Use 'pull' or 'merge' to merge local branches?

I have seen two different ways of merging local branches. git checkout master git merge new_feature git checkout master git pull . new_feature What is the difference, pros/cons?
Kris
  • 19,188
  • 9
  • 91
  • 111
9
votes
2 answers

Do a Git pull to overwrite local changes

There has certainly been posts around for this, but I actually did a commit because I thought it was the right thing to do. So, I have two repositories, one development and one production. I had to edit something in the production because it was an…
Andre
  • 790
  • 2
  • 9
  • 23
9
votes
4 answers

How do I pull a remote branch in git without conflicts?

There is a branch on remote I would like to work on. It is old and I no longer have an old copy of it on my local machine. It is really far behind master. Whenever I attempt to pull it I get conflicts. I just want to create an exact duplicate of the…
Bjorn
  • 69,215
  • 39
  • 136
  • 164
9
votes
1 answer

Git Pull Doesn't Do A Git Fetch

My understanding has always been that git pull is essentially a combination of git fetch and git merge ... but I have encountered it a number of times where pulling, then comparing shows changes that aren't mine until I also do a fetch: (on branch…
pinkboi
  • 259
  • 2
  • 9
8
votes
0 answers

Docker pull giving connection reset by peer error

I have installed Docker on Ubuntu machine. I have problem with docker pull command, I am getting connection reset by peer error. root@machine1:~# docker pull ubuntu Using default tag: latest Error response from daemon: Get…
Harsha Biyani
  • 7,049
  • 9
  • 37
  • 61
8
votes
5 answers

How to git pull while ignoring the local changes?

As I am trying to pull some changes from origin/master, I am getting this error : error: Your local changes to the following files would be overwritten by merge because I made local changes. I don't want to commit these changes, so I suppose I…
M.A.B
  • 541
  • 2
  • 5
  • 6
8
votes
7 answers

How to view git pull requests in a local server, in command line?

I'm running a local git server, and I'm just wondering, is there a way to see all the pull-requests made by developers? Similar to Github or Bitbucket but in command line.
Alexandru
  • 833
  • 1
  • 8
  • 24
1 2 3
…
64 65