WordPress数据库错误: [Got error 28 from storage engine]
SHOW FULL COLUMNS FROM `wp_options`

WordPress数据库错误: [Got error 28 from storage engine]
SELECT t.*, tt.*, tr.object_id FROM wp_terms AS t INNER JOIN wp_term_taxonomy AS tt ON t.term_id = tt.term_id INNER JOIN wp_term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ('category', 'post_tag', 'post_format') AND tr.object_id IN (708) ORDER BY t.name ASC

【Git】pull遇到错误:error: Your local changes to the following files would be overwritten by merge: – Crazy knowledge base
Crazy knowledge base

【Git】pull遇到错误:error: Your local changes to the following files would be overwritten by merge:

这种情况下,如何保留本地的修改同时又把远程的合并过来呢?

首先取决于你是否想要保存本地修改。( /

 

别急我们有如下三部曲

git stash
git pull origin master
git stash pop

STASH

这时候执行git stash pop你去本地看会发现发生冲突的本地修改还在,这时候你该commit push啥的就悉听尊便了。

既然不想保留本地的修改,那好办。直接将本地的状态恢复到上一个commit id 。然后用远程的代码直接覆盖本地就好了。

git reset --hard 
git pull origin master

 

【Git】pull遇到错误:error: Your local changes to the following files would be overwritten by merge:

WordPress数据库错误: [Got error 28 from storage engine]
SELECT t.*, tt.* FROM wp_terms AS t INNER JOIN wp_term_taxonomy AS tt ON t.term_id = tt.term_id INNER JOIN wp_term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ('category') AND tr.object_id IN (693) ORDER BY t.name ASC

发表评论

滚动到顶部