Resolve dialog If you select a file containing conflicts and then invoke Local|Resolve in the menu of SmartGit's main window, the Resolve dialog will come up, where you can set the file's contents to either of the two conflicting versions, i.e.

Generally, the following options are available: This section explains how you can do that with SmartGit.

When a merge, a cherry-pick or a rebase fails due to conflicting changes, SmartGit stops the operation and leaves the working tree in a conflicted state, so that you can either abort the operation, or resolve the conflicts and continue with the operation. When using rebase instead of merge, Git applies the local commits on top of the commits from the tracked branch, thus avoiding a merge commit. For example, if a user has made local commits and performs a pull with merge, a merge commit with two parent commits - the user's last commit and the last commit from the tracked branch - is created. Merge versus RebaseĪ Git-specific alternative to merging is rebasing (see Rebase), which can be used to keep the history linear. Thus, to perform a squash merge you have to choose Merge to Working Tree when initiating the merge, since otherwise you won't see the Commit dialog. On the Commit dialog, you can choose between a normal merge (merge commit) and a squash merge (simple commit).

Smartgit rebase branch on top of master