pull

git pull and reset stopped by error “unable to create file <filename> (File exists)”

一曲冷凌霜 提交于 2019-12-06 08:06:04
I am currently moving my company to Git from Vault, and I've set up the repos on Github, but setting up locally is being made a headache by some reoccurring errors. The most baffling is that when I try to pull, it cancels with the error "error: unable to create file (File exists)" for a few files. I just want to set myself up with what is on the remote, so I try to do a git reset --hard HEAD, and it tells me that it succeeded and my working directory is clean. I try to pull again and get the same error! When I run git gc, it just restores my unstaged changes. A look at the git diff and the

Reading database file from android device

与世无争的帅哥 提交于 2019-12-05 22:27:35
I've been trying to pull a copy of my sqlite database from my android app for dev. My first attempt was to call: ./adb shell cd data/data cd com.example.app cd databases But then I get stuck here as I do not have permission to do a pull or even view the files in that dir! So I thought I'd try out the DDMS File Explorer which gives me this: But when I try and pull files from here (I would expect them to be in the data folder) it just pulls the directory and nothing else. How can I do this to pull a copy of the database my app is creating/using? I have tried this when the phone is on the SD card

Google apps script to grab data from webpage

坚强是说给别人听的谎言 提交于 2019-12-05 22:18:16
I had help making this script before that would pull the playercount off a website and log it into spreadsheets with a date and timestamp, this was: function pullRuneScape() { var page = UrlFetchApp.fetch('http://runescape.com/title.ws').getContentText(); var number = page.match(/PlayerCount.*>([0-9,]+)</)[1]; SpreadsheetApp.getActive().getSheetByName('RuneScape').appendRow([new Date(), number]); } Basically in the webpage they list the amount of players and I wanted to log it every 5minutes or so, but they have another site I wanted to grab the number from too and I need some help. It's at

git pull from remote… can I pull a specific commit? [duplicate]

巧了我就是萌 提交于 2019-12-05 18:42:45
This question already has answers here : Retrieve specific commit from a remote Git repository (9 answers) Closed 6 years ago . I create an empty new repository locally, I add a remote repository. Now I want to get a specific commit from the remote repository without downloading the whole remote repository with all its branches! How do I do that? basZero Answer is git fetch origin 96de5297df870:refs/remotes/origin/D-commit See Retrieve specific commit from a remote Git repository 来源: https://stackoverflow.com/questions/16795813/git-pull-from-remote-can-i-pull-a-specific-commit

GIT can't pull: failed to symlink 'path/filename': File name too long

隐身守侯 提交于 2019-12-05 12:32:51
Feeling silly, but I can't figure out what to do here. I have a local copy of a repository stored on a remote server. The remote server has changes I need, and I've committed changes on my local copy. I can't push, because I need to merge the changes from the newer version that exists on the server. When I pull, I get this error: git pull origin master From server.name:reponame * branch master -> FETCH_HEAD fatal: failed to symlink 'path/to/filename ': File name too long Not sure what would be happening here. The crazy thing is that the file path/to/filename is an actual file, not a symlink.

How to set Mercurial upstream

强颜欢笑 提交于 2019-12-05 09:31:12
问题 I created local hg repository for new project: hg init ; hg addremove , then I created empty upstream repo, and pushed first version there: hg push https://remoterepo . Now, I want to set that https://remoterepo as default upstream, so I can just do hg push/pull without giving it. I was surprised Google did not give me a straight answer with "set mercurial upstream", and I didn't find a direct answer here at SO either. So, for the benefit of all the people using SO as a howto, what's the

Does GitHub support git:// protocol for pull?

五迷三道 提交于 2019-12-05 08:26:26
Is it possible to use such configuration? Or there are no advatages between ssh:// and git://? Yes, it does. However, the URL bar in github web page no loner have git protocol for copying the URL to clipboard. You have to replace https:// with git:// by yourself. Also, git protocol use port 9418. Make sure you can use this port. git protocol is not encrypted, but it is faster than https. git protocol is read-only in github. You cannot push to it via git protocol. 来源: https://stackoverflow.com/questions/19317264/does-github-support-git-protocol-for-pull

Git pull时出错

我们两清 提交于 2019-12-05 02:44:38
在使用Git pull命令将远程代码拉取到本地的时候,出现错误,无法拉取。错误如下: Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution, or use 'git commit -a'. 原因: 实际上,git pull命令是将git fetch和git merge两个命令合并起来的一个“综合”命令。 它的作用是:将远程的代码和更新,拉取到本地并且更新本地的代码。其中的一个弊端是,你的本地工作目录在未经确认的情况下就会被远程分支更新,这里我们暂且不提。 正是git merge命令导致出现了上边使用git pull出现的问题。所以这就需要将本地与远程的代码之间的冲突解决掉,才可以进行正常的git pull。下面介绍2个方面的办法: (1)如果想保留本地的修改,使用下面的命令,将文件add,然后commit。 git add -u git commit -m "描述" git pull (2)想保留本地的修改,但是还不想新加一次commit,可以使用git stash命令。 git stash 可用来暂存当前正在进行的工作,

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

风格不统一 提交于 2019-12-05 02:02:57
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 any project file in Xcode. That leaves me no option but to do a single commit that contains that file, which fill the git commit logs with meaningless commits. Is this there is a way to stop this behavior? I tried to put *.xcuserstate and xcuserdata into git ignore but that caused Xcode to crash every time I try to pull. This happens with Xcode 4.2

Opposite of `git push --mirror`? How do I get my repo back?

半城伤御伤魂 提交于 2019-12-04 12:18:02
问题 I am having great success with git push --mirror to make backup copies to a bare repo. But after search on SO and elsewhere, I cannot find a way to clone the thing locally with all branches. I do not want to use git clone since I don't want my local repo to know about the bare repo. If I use git pull it only brings down the HEAD branch. Guessing: git pull /data/Dropbox/backup/that_stuff.git * gets me nowhere, of course. How do I get the entire repo with all branches back again? I realize I