Skip directly to content

Error message

  • Warning: Illegal string offset 'field' in DatabaseCondition->__clone() (line 1818 of /homepages/0/d190592849/htdocs/spiffboy/includes/database/query.inc).
  • Warning: Illegal string offset 'field' in DatabaseCondition->__clone() (line 1818 of /homepages/0/d190592849/htdocs/spiffboy/includes/database/query.inc).

git

Fixing accidentally merging to master (instead of develop) branch

on Thu, 03/31/2011 - 17:33

Recently a friend ran into an issue where the branch they thought they were working on was the development branch when in fact it was the master branch. She was asking how to get the changes she had just made, back into the development branch since they were on the master. Since these branches had been at the same commit prior to the work she had done the solution was simple, checkout the development branch and run git merge master and this solved her issue.