master

git refname 'origin/master' is ambiguous

匿名 (未验证) 提交于 2019-12-03 01:58:03
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: I have a git repository that is tracking several remote branches: $ git branch - a * master remotes / git - svn remotes / origin / master remotes / trunk When I try to setup a default one I get the following error: $ git branch -- set - upstream - to = origin / master master warning : refname 'origin/master' is ambiguous . fatal : Ambiguous object name : 'origin/master' . I would like to kremove some of the remote master branches but the master references are still there. How can I remove them to be able to set the default upstream

Is there a git-merge --dry-run option?

匿名 (未验证) 提交于 2019-12-03 01:58:03
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: I'm merging in a remote branch that may have a lot of conflicts. How can I tell if it will have conflicts or not? I don't see anything like a --dry-run on git-merge . 回答1: As noted previously, pass in the --no-commit flag, but to avoid a fast-forward commit, also pass in --no-ff , like so: $ git merge -- no - commit -- no - ff $BRANCH To examine the staged changes: $ git diff -- cached And you can undo the merge, even if it is a fast-forward merge: $ git merge -- abort 回答2: I just had to implement a method that automatically finds

Cocoapods: Failed to connect to GitHub to update the CocoaPods/Specs specs repo

匿名 (未验证) 提交于 2019-12-03 01:58:03
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: When running pod repo update the following error is generated: Updating spec repo `master` [!] Failed to connect to GitHub to update the CocoaPods / Specs specs repo - Please check if you are offline , or that GitHub is down Using cocoapods 1.0.1 I'm also aware of this: . Adding --verbose flag to the call shows the ruby call stack: . rvm / gems / ruby - 2.3 . 0 / gems / cocoapods - core - 1.0 . 1 / lib / cocoapods - core / github . rb : 100 : in `modified_since_commit' .rvm/gems/ruby-2.3.0/gems/cocoapods-core-1.0.1/lib/cocoapods

Git merge errors

匿名 (未验证) 提交于 2019-12-03 01:58:03
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I have a git branch called 9-sign-in-out with perfectly working code, and I want to turn it into the master. I'm currently on the master branch. $ git branch 9-sign-in-out * master I'm trying to switch to 9-sign-in-out branch, but it doesn't allow me to: $ git checkout 9-sign-in-out app/helpers/application_helper.rb: needs merge config/routes.rb: needs merge error: you need to resolve your current index first Any idea how can I ignore all the master branch errors and turn the 9-sign-in-out branch into the master? Maybe git rebase ? But I don

having problems trying to restore encrypted database

匿名 (未验证) 提交于 2019-12-03 01:58:03
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: Im trying to copy an encrypted database from the default server to my server for testing purposes but im having troubles doing so because i have never done it so im going to explain my procedure and the errors i got first i create a master key : USE master GO CREATE MASTER KEY ENCRYPTION BY PASSWORD ='DB-PaSSw0rD' GO all is good for now : Command(s) completed successfully. then i create a certificate by importing the certificate created on the default server: CREATE CERTIFICATE TDECERT FROM FILE = 'C:\temp\TDECert.cer' WITH PRIVATE KEY (FILE

Failed to lock refs/heads/master

匿名 (未验证) 提交于 2019-12-03 01:57:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: I am relativly new to git and am facing this problem. The git push command shows the error below. I will explain to you from the begining what i had been trying to do . I created a submodule, commited and pushed it. The push throws the error below. Salman@PC_HOME ~ /git/ breakit - web - app ( master ) $ git push origin master error : refs / heads / master does not point to a valid object ! Counting objects : 4 , done . Delta compression using up to 2 threads . Compressing objects : 100 % ( 3 / 3 ), done . Writing objects : 100 % (

git push origin gives remote part of refspec is not a valid name

匿名 (未验证) 提交于 2019-12-03 01:57:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I have created a remote repo using my GitHub account at https://github.com/darKoram/sphero_tracker.git . So far it just contains some wiki pages, but I'm ready to upload my code. I use git push origin git@github.com:/darkoram/shpero_tracker.git I also tried git push origin https://github.com/darKoram/sphero_tracker.git both times I get remote part of refspec is not a valid name in https://github.com/darKoram/sphero_tracker.git I've pushed before without problems. Just don't know what I'm doing wrong here. I got a little further. Followed the

Troubleshooting “require_once(../bootstrap.php.cache): failed to open stream: No such file or directory”

匿名 (未验证) 提交于 2019-12-03 01:56:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I am trying to redeploy a Symfony 2.1x project I have been working on and app_dev.php is failing because it can't find app/bootstrap.php.cache . This file is omitted from the project's git repository because I used Symfony2's recommend .gitignore file: # .gitignore /app/bootstrap* Am I correct in thinking that app/bootstrap.php.cache is generated during the $ php composer.phar install process? If this is the case then I will include for you my composer.json : // composer.json { "name": "symfony/framework-standard-edition", "description":

git fetch vs. git fetch origin master have different effects on tracking branch

匿名 (未验证) 提交于 2019-12-03 01:55:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: This is mostly of the nature of a curiosity as I'm trying to get familiar with Git. I have looked at the documentation for 'git fetch' but I don't see an obvious explanation for the below. Thanks in advance, and apologies if this is howlingly obvious. 1) From a central repository, say GitHub, I clone a repository named website on each of two machines, HostA and HostB . 2) on HostA , I make a change to a file, say README.txt , and commit it. At this point on HostA , the commits for branches master and origin/master are, as expected different

Postgres unique constraint vs index

匿名 (未验证) 提交于 2019-12-03 01:55:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: As I can understand documentation the following definitions are equivalent: create table foo ( id serial primary key, code integer, label text, constraint foo_uq unique (code, label)); create table foo ( id serial primary key, code integer, label text); create unique index foo_idx on foo using btree (code, label); However you can read in the note: The preferred way to add a unique constraint to a table is ALTER TABLE ... ADD CONSTRAINT. The use of indexes to enforce unique constraints could be considered an implementation detail that should