master

fatal: unable to create 'refs/heads/master.lock': File exists fatal: - Getting this error while pushing the commits

匿名 (未验证) 提交于 2019-12-03 08:33:39
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I am getting the following error while pushing the commit $ git push origin master fatal: unable to create 'refs/heads/master.lock': File exists fatal: The remote end hung up unexpectedly I thought of removing the lock file ( refs/heads/master.lock ) from my local machine. But this file is not available. I think this file is in git server. What is the origin of this issue? If I remove this file from the server, will it solve the issue if the file exists? 回答1: You need to remove existing .lock file and try to push, Linux rm -f .git/refs/heads

You are on a branch yet to be born

匿名 (未验证) 提交于 2019-12-03 08:33:39
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: Im have strange problem: $ cd ~/htdocs $ mkdir test $ cd test $ git init Initialized empty Git repository in /home/deep/htdocs/test/.git/ $ git checkout master error: pathspec 'master' did not match any file(s) known to git. $ git checkout -b master fatal: You are on a branch yet to be born $ git checkout origin/master error: pathspec 'origin/master' did not match any file(s) known to git. $ git branch -a (empty this) But this is new local empty repo. Where is master branch? 回答1: As ever, Git is right, it just has a quirky way of saying it:

Git: which is the default configured remote for branch?

匿名 (未验证) 提交于 2019-12-03 08:33:39
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I have a remote bare repository hub . I work only in the master branch. The last sentence of this error message below makes me wonder: How do I find out which is the "default configured remote for your current branch" ? And how do I set it? [myserver]~/progs $ git remote -v hub ~/sitehub/progs.git/ (fetch) hub ~/sitehub/progs.git/ (push) [myserver]~/progs $ git branch -r hub/master [myserver]~/progs $ git remote -v hub ~/sitehub/progs.git (fetch) hub ~/sitehub/progs.git (push) [myserver]~/progs $ cat .git/HEAD ref: refs/heads/master

git branch: gh-pages

匿名 (未验证) 提交于 2019-12-03 08:33:39
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: I have a repo on GitHub. Recently I have discovered GitHub's pages and I want to use them. I would like to create this new branch and then, when I need to, either commit on master branch or on gh-pages branch. How can I do this? Do I have to create another folder inside my repo? 回答1: You might find this tutorial useful: Setup GitHub Pages "gh-pages" branch and "master" branch as subfolders of a parent project folder ("grandmaster") . To me this approach seems simpler then doing a git checkout gh-pages each time you want to edit

active menu item - asp.net mvc3 master page

匿名 (未验证) 提交于 2019-12-03 08:33:39
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: I've been scanning around trying to find an appropriate solution for assigning "active/current" class to menu items from the master page. The line is split down the middle with regards of whether to do this client vs server side. Truthfully I'm new to both JavaScript and MVC so i don't have an opinion. I would prefer to do this in the "cleanest" and most appropriate way. I have the following jQuery code to assign the "active" class to the item...the only problem is the "index" or default view menu item will always be assigned the

Modularization of Jasper reports: Pass data source to subreport without unnecessary db roundtrips?

匿名 (未验证) 提交于 2019-12-03 08:28:06
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: In this thread how-to-pass-main-report-data-source-to-subreport-jasperreports it is stated that there may be problems with subreports on reusing an existing master reports data source . It says the subreport may close the datasource prematurely (before other iterations calling the subreports may be processed). It seems that this may be my problem because the report is always generated (without an error) ... ok: using the connection from the master report (thus each time executing the query again: once for the master and additionally for each

Run interactive Bash with popen and a dedicated TTY Python

匿名 (未验证) 提交于 2019-12-03 08:28:06
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I need to run an interactive Bash instance in a separated process in Python with it's own dedicated TTY (I can't use pexpect). I used this code snippet I commonly see used in similar programs: master, slave = pty.openpty() p = subprocess.Popen(["/bin/bash", "-i"], stdin=slave, stdout=slave, stderr=slave) os.close(slave) x = os.read(master, 1026) print x subprocess.Popen.kill(p) os.close(master) But when I run it I get the following output: $ ./pty_try.py bash: cannot set terminal process group (10790): Inappropriate ioctl for device bash: no

GIT常用命令

纵饮孤独 提交于 2019-12-03 08:09:34
文档:git命令.note 链接:http://note.youdao.com/noteshare?id=ac0dafda7ca22096fc27b49541db474b&sub=BB2AB91B4A6740E6800FD66AA1455B480本地代码提交到远程仓库: 设置git用户名、邮箱 git config --global user.name xxx git用户名 git config --global user.email xxx git邮箱 将项目提交到主分支(master): git remote rm origin 删除现有远程连接 git init 初始化本地仓库 touch README.md 创建README.md文件 git add . 将修改的文件添加到暂存 git commit -m "first commit" 将暂存中的文件提交到本地当前分支 git remote add origin https://xxxxxxx.xx/xx/ 将本地仓库连接到远程仓库 git push -u origin master 将本地仓库文件push到远程master分支 将主分支代码pull到dev分支: git branch -a 查看远程全部分支 git checkout -b dev origin/dev 在本地创建dev分支并将远程dev分支更新到本地分支

GIT版本管理工具教程

若如初见. 提交于 2019-12-03 08:09:13
GIT版本管理工具教程 一 Git初始化 下载安装, 下载地址: https://git-scm.com/downloads 每个系统的都有(linux、mac、windows等),看官网的安装教程,很详细,此处我以windows来练习 首先创建一个文件夹,这个文件夹就是我们将来通过git来管理的所有文件的存放地点 。 在文件夹中右键 使用Git Bash 在弹出的窗口中执行初始化指令,让git帮我们对这个文件夹中的所有文件以及文件夹进行管理 git init #创建git版本管理的本地仓库 产生的.git文件夹用来存放你管理的文件的所有版本以及git配置相关的内容,不要轻易动它 二 简单指令使用 基本操作 git status 查看仓库中所有的文件夹和文件的状态 git add supercrm 让git管理单独的文件夹或者文件 git add . 管理所有文件和文件夹 配置用户名和邮箱 $ git config --global user.name <用户名> $ git config --global user.email <邮箱地址> 例如: $ git config --global user.name "吴超" $ git config --global user.email "1069696250@qq.com" 然后就可以提交版本了,看指令 git commit

kubernetes部署EFK日志系统

坚强是说给别人听的谎言 提交于 2019-12-03 08:07:10
EFK简介 Kubernetes 开发了一个 Elasticsearch 附加组件来实现集群的日志管理。这是一个 Elasticsearch、Fluentd 和 Kibana 的组合。 Elasticsearch 是一个搜索引擎,负责存储日志并提供查询接口; Fluentd 负责从 Kubernetes 搜集日志,每个node节点上面的fluentd监控并收集该节点上面的系统日志,并将处理过后的日志信息发送给Elasticsearch; Kibana 提供了一个 Web GUI,用户可以浏览和搜索存储在 Elasticsearch 中的日志。 通过在每台node上部署一个以DaemonSet方式运行的fluentd来收集每台node上的日志。Fluentd将docker日志目录/var/lib/docker/containers和/var/log目录挂载到Pod中,然后Pod会在node节点的/var/log/pods目录中创建新的目录,可以区别不同的容器日志输出,该目录下有一个日志文件链接到/var/lib/docker/contianers目录下的容器日志输出。 部署环境装备 软件版本: Elasticsearch版本:elasticsearch:v6.5.4 Kibana版本:kibana:6.5.4 Fluentd版本:fluentd-elasticsearch:v2.3