https://blog.qife122.com/tags/git-merge/ Recent content in Git Merge on 办公AI智能小助手 Hugo zh-cn qife Sat, 25 Oct 2025 20:49:51 +0800 https://blog.qife122.com/p/git-merge-2025%E6%8A%80%E6%9C%AF%E7%9B%9B%E4%BC%9A%E5%BA%86%E7%A5%9Dgit%E8%AF%9E%E7%94%9F20%E5%91%A8%E5%B9%B4%E7%9A%84%E6%8A%80%E6%9C%AF%E4%BA%AE%E7%82%B9%E4%B8%8E%E7%A4%BE%E5%8C%BA%E5%8D%8F%E4%BD%9C/ Sat, 25 Oct 2025 20:49:51 +0800 https://blog.qife122.com/p/git-merge-2025%E6%8A%80%E6%9C%AF%E7%9B%9B%E4%BC%9A%E5%BA%86%E7%A5%9Dgit%E8%AF%9E%E7%94%9F20%E5%91%A8%E5%B9%B4%E7%9A%84%E6%8A%80%E6%9C%AF%E4%BA%AE%E7%82%B9%E4%B8%8E%E7%A4%BE%E5%8C%BA%E5%8D%8F%E4%BD%9C/ <h2 id="git诞生20周年github总部两日盛会git-merge-2025亮点回顾-">Git诞生20周年，GitHub总部两日盛会：Git Merge 2025亮点回顾 🎉</h2> <p>在Linus首次git提交二十年后，来自世界各地的贡献者齐聚旧金山GitHub总部——不仅回顾Git的历史，更展望其未来。Git Merge 2025通过技术演讲、社区协作和无法在幻灯片中呈现的走廊交流，庆祝了Git的20周年。超过100人亲临现场，600多人在线参与。</p>