ga-dc / wdi5-project4

3 stars 0 forks source link

merging my branch back to master: git issues #131

Closed seekpeace closed 9 years ago

seekpeace commented 9 years ago

15:24:14-seekpeace~/projects/portfolio_guard (master)$ git checkout -b actionmailer Switched to a new branch 'actionmailer' i did the above an eon ago and now when i do 22:33:33-seekpeace~/projects/portfolio_guard (actionmailer)$ git checkout master error: pathspec 'master' did not match any file(s) known to git.

git headache to the bitter end and thank you for any assist.

RobertAKARobin commented 9 years ago

What's the output of git branch -av?

seekpeace commented 9 years ago

22:48:40-seekpeace~/projects/portfolio_guard (actionmailer)$ git status On branch actionmailer nothing to commit, working directory clean 22:48:42-seekpeace~/projects/portfolio_guard (actionmailer)$ git checkout master error: pathspec 'master' did not match any file(s) known to git. 22:48:45-seekpeace~/projects/portfolio_guard (actionmailer)$ git branch -av

RobertAKARobin commented 9 years ago

It's because you only have one branch, actionmailer

RobertAKARobin commented 9 years ago

You don't have a master branch.

RobertAKARobin commented 9 years ago

You can rename your current branch by using git branch -m "new name here"

seekpeace commented 9 years ago

but i did this earlier: 15:24:14-seekpeace~/projects/portfolio_guard (master)$ git checkout -b actionmailer Switched to a new branch 'actionmailer' but ok.

seekpeace commented 9 years ago

ok i just renamed it to master, thanks Robin!