Help & Support

Resolve a conflict

When you perform a history manipulation that results in a conflict, Retcon will pause, and prepare for conflict resolution.

You can resolve conflicts in multiple ways:

• Resolve the conflict in an editor or merge tool.

  Resolve the conflict as with a conventional Git client, by opening the conflicting files in either a code editor, or a merge tool.

  When done, mark the conflict as resolved by staging the files, then choose Apply Resolution to continue.

• Dismiss the conflict by making additional changes.

  It is still possible to manipulate history while Retcon is paused. When you make a change while paused, Retcon dismisses the current conflict, and evaluates the new history you've created. If that new history does not create a conflict, Retcon unpauses.

  For instance, if two commits that modify the same line of code are swapped, a conflict will occur. In that case, reorganize the commits to be in their original order again.

• Undo the manipulations.

  If the conflict is unexpected, you can undo the history manipulation by choosing Edit > Undo (⌘Z). This will revert to the previous version of the history, and unpause Retcon.

Amend an older commit

To edit the changes of any commit:

1. Select the commit, and choose Edit (⌘E).

   Retcon rewinds to this commit, and pauses. The files in your repository now reflect the commit's state.

2. In your code editor, edit the files as desired.
3. Back in Retcon, stage all the files you modified, and confirm the edit by choosing Apply Changes (⌘⏎).

Undo an operation

Almost any operation in Retcon can be reverted using Edit > Undo (⌘Z).

These operations cannot be reverted with undo:

• Switching branches. Instead, choose Branch > Go Back (⌘[), or use the Back/Forward toolbar buttons.
• Discarding changes in a file or folder
• Modifying a file in another app

These operations can be reverted with undo:

• Staging or unstaging files
• Reverting the stage
• Creating a commit
• Amending a commit
• Moving a commit
• Fixupping a commit
• Deleting a commit
• Editing a commit message
• Beginning/confirming/skipping a commit edit
• Confirming a conflict resolution
• Reverting a conflict resolution
• Rebasing a branch
• Merging a branch
• Creating or deleting a branch
• Aborting a rewrite
• Pushing a branch to a remote
• Pulling a branch from a remote
• Changing the history in another app
• Changing the stage in another app

Authenticate with remotes using a third-party SSH agent

If you use a third-party application to manage your SSH keys, you may need to perform a one-time setup to give Retcon access to these keys.

1Password

To allow Retcon to communicate with the 1Password SSH agent, follow the “Configure SSH_AUTH_SOCK globally for every client” instructions from the 1Password documentation.

Secretive

To allow Retcon to communicate with the Secretive SSH agent, follow the Cyberduck instructions from the Secretive FAQ.

Another client

For help with using an SSH agent not mentioned in this guide, please contact us.