Skip to content

Fork

Fork is a Git desktop app for Mac and Windows. It shows changes side by side, lets you select individual lines for a commit and includes a tool for resolving conflicting edits.

Visit Fork

Can you put one change in a commit and keep another for later?

Yes. Fork can stage or unstage individual lines, meaning you choose which edits belong in the next saved version. Read the staged change before committing. Check that any edit left out still appears in your working changes.

Fork also has a helper for merge conflicts, which happen when Git needs you to decide how overlapping edits fit together. Read both versions, check the result and verify that it still does what you expect before sharing it.

What is free to try and what do you pay for?

Fork allows free evaluation and requires a license for long-term use. Its purchase page lists $59.99 as a one-time purchase for one user on up to three machines at a time, for personal or commercial use. The purchase is for the desktop app. Repository hosting and access are separate.

Can you keep the saved history in another Git app?

Keep the Git repository and check that the branch and commits you need are present after switching. Check for uncommitted edits separately. The app also offers Git history and recovery views, but what you can recover depends on what still exists in the Git repository.

A remote is a saved address for another copy. Verify its address and your access again before sending any changes from a replacement client.

What should appear when you record just one line?

Use two paper edits far apart in a fictional README. Do not open a repository or connect an account.

  1. Choose the intended line
    Mark the delivery wording as staged and leave the contact wording unstaged.
  2. Check two views
    The pretend staged view should contain only the delivery wording. The working file still has both edits.
  3. Read the new history card
    The new commit should contain only the delivery edit. The other edit stays available to review later. Nothing is sent to another computer.