GitTree desktop manual
Merge and resolve
Bring branches together: merge or rebase, settle conflicts line by line, and move single commits where you need them.
Merge branches
Merging brings the commits of another branch into the branch you are on, like
Freegit merge. Right-click the other branch and choose Merge … into …: GitTree checks for conflicts first and lets you choose how the merge is recorded.Rebase a branch
Rebasing replays the commits of your branch on top of another branch, so the history stays a straight line, like
Freegit rebase. The commits get new ids; GitTree keeps the old branch underrefs/ogt/trashand Undo brings it back.Resolve merge conflicts
A conflict happens when both branches changed the same lines. GitTree’s resolver shows the two versions side by side, A and B: tick the lines to keep in each conflict, check the Output, then Save and continue the merge, rebase or cherry-pick.
FreeCherry-pick and revert commits
Cherry-Pick Commit copies the changes of one commit onto your current branch as a new commit, like
Freegit cherry-pick. Revert Commit adds a new commit that undoes one, likegit revert: the safe way to take back something already pushed.Continue, skip or abort an operation
A merge, rebase, cherry-pick or revert can stop halfway, usually on a conflict. A banner above the graph names the operation and its step, and offers Resolve, Continue, Skip (rebase) and Abort…. Aborting saves what it drops first, so Undo brings it back.
FreeReuse recorded conflict resolutions
With Reuse recorded resolutions (rerere) on, Git remembers how you resolved a conflict and writes the same resolution when that conflict comes back, during a repeated rebase for example. GitTree tells you when it happened and lets you review it before marking the file resolved.
Free