<?xml version="1.0" encoding="utf-8" ?><rss version="2.0"><channel><title><![CDATA[JunePeng的博客]]></title><description><![CDATA[]]></description><link>https://blog.youkuaiyun.com/JunePeng</link><language>zh-cn</language><generator>https://blog.youkuaiyun.com/</generator><copyright><![CDATA[Copyright &copy; JunePeng]]></copyright><item><title><![CDATA[常用的git命令或者快捷键]]></title><link>https://blog.youkuaiyun.com/JunePeng/article/details/125156136</link><guid>https://blog.youkuaiyun.com/JunePeng/article/details/125156136</guid><author>JunePeng</author><pubDate>Mon, 06 Jun 2022 22:54:53 +0800</pubDate><description><![CDATA[git命令常用]]></description><category></category></item><item><title><![CDATA[js实现复制功能]]></title><link>https://blog.youkuaiyun.com/JunePeng/article/details/125155336</link><guid>https://blog.youkuaiyun.com/JunePeng/article/details/125155336</guid><author>JunePeng</author><pubDate>Mon, 06 Jun 2022 22:13:53 +0800</pubDate><description><![CDATA[利用js实现复制功能]]></description><category></category></item><item><title><![CDATA[button靠右排列]]></title><link>https://blog.youkuaiyun.com/JunePeng/article/details/125152769</link><guid>https://blog.youkuaiyun.com/JunePeng/article/details/125152769</guid><author>JunePeng</author><pubDate>Mon, 06 Jun 2022 19:34:04 +0800</pubDate><description><![CDATA[无]]></description><category></category></item><item><title><![CDATA[a标签的常用]]></title><link>https://blog.youkuaiyun.com/JunePeng/article/details/125152523</link><guid>https://blog.youkuaiyun.com/JunePeng/article/details/125152523</guid><author>JunePeng</author><pubDate>Mon, 06 Jun 2022 19:14:23 +0800</pubDate><description><![CDATA[无]]></description><category></category></item><item><title><![CDATA[git合作开发时，没有pull就直接push会怎样]]></title><link>https://blog.youkuaiyun.com/JunePeng/article/details/124870876</link><guid>https://blog.youkuaiyun.com/JunePeng/article/details/124870876</guid><author>JunePeng</author><pubDate>Thu, 19 May 2022 20:49:52 +0800</pubDate><description><![CDATA[git的时候总会遇到一些奇怪的问题

目前遇到最麻烦的还是在push之前没有pull

每天上班第一件事pull一下，上传代码之前一定要pull

没有pull就push，会出现merge

即使使用git reset --soft HEAD^，会回到仓库，但是会出现其他同事提交的代码，这个时候想pull也不行，会提示有待merge的，因为别人也提交了代码 ，导致自己不敢直接上传，万一影响了别人就很惨了。

具体我是这么做的：

1、git log 查看commit的记录，查找上一个（！！！最近的那一个）没]]></description><category></category></item><item><title><![CDATA[说说我在装VMware虚拟机遇到的问题]]></title><link>https://blog.youkuaiyun.com/JunePeng/article/details/124604650</link><guid>https://blog.youkuaiyun.com/JunePeng/article/details/124604650</guid><author>JunePeng</author><pubDate>Fri, 06 May 2022 10:44:35 +0800</pubDate><description><![CDATA[安装VMware虚拟机遇到的问题]]></description><category></category></item></channel></rss>