CozyDev

Stay curious

git rerere

git rerere 是 Git 中的一個功能，全名是 “reuse recorded resolution” 意思是重複使用已記錄的解決方案。當你在合併分支或應用補丁時，常常會遇到需要手動解決的衝突情況。但是如果你在

Posted by Eirik on Saturday, April 6, 2024

git stash

在開發軟體時，可能會遇到一種情境：當某個系統開發已經進行到一半，突然被老闆或客戶「插隊」，需要緊急修正一個現有系統的 Bug 或添加一個功能。 這時候

Posted by Eirik on Saturday, April 6, 2024

git rebase

Rebase branch and repositories

In your local clone of your forked repository, you can add the original GitHub repository as a “remote”. (“Remotes” are like nicknames for the URLs of repositories - origin is one, for example.) Then you can fetch all the branches from that upstream repository, and rebase your work to continue working on the upstream version. 到你 fork repository 的 local cloned area 中，你可以將原

Posted by Eirik on Saturday, March 2, 2024

Mercurial and Git

What are the differencess

Mercurial and Git are both used for version control. Both Mercurial (Hg) and Git are popular distributed version control systems (DVCS), but they have some key differences in their approach: Branching Model: Mercurial: Employs a centralized branching model, meaning each branch has its own separate directory. Switching branches involves changing directories. This can be simpler for beginners but less flexible for complex workflows. Git: Uses a decentralized branching model, where

Posted by Eirik on Friday, February 2, 2024

avatar

Hardware Engineer, Coder and Life Adventurer

Quick Links
Tags