Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #105. #115

Merged
merged 1 commit into from
Mar 16, 2013
Merged

Fixed #105. #115

merged 1 commit into from
Mar 16, 2013

Conversation

inetfuture
Copy link

Use '-M' to force rename branch when setup git in deploying process, otherwise, git will throw error: 'fatal: A branch named 'master' already exists.' if 'config.branch' is 'master' and therefore later process will fail.

Use '-M' to force rename branch when setup git in deploying process, otherwise, git will throw error: 'fatal: A branch named 'master' already exists.' if 'config.branch' is 'master' and therefore later process will fail.
@inetfuture
Copy link
Author

Actually, it's not about #105, I misidentified it. This commit solved this problem:

root@aaron-desktop:/home/aaron/workspace/blog# hexo deploy
Setting up.
Initialized empty Git repository in /home/aaron/workspace/blog/.deploy/.git/
[master (root-commit) bfd5a5b] First commit
 0 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 placeholder
fatal: A branch named 'master' already exists.

tommy351 added a commit that referenced this pull request Mar 16, 2013
@tommy351 tommy351 merged commit 3c41596 into hexojs:dev Mar 16, 2013
@inetfuture inetfuture deleted the Fix#105 branch March 17, 2013 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants