---
{"title": "How to resolve a simple merge from a GUI for designers", "description": "Learn how designers who commit can resolve a simple merge in a graphical client, with step-by-step guidance and tool options.", "url": "https://saydeploy.com/how-to-resolve-a-simple-merge-from-a-gui-for-designers-who-commit/", "date": "2026-10-17"}
---
Learn how designers who commit can resolve a simple merge in a graphical client, with step-by-step guidance and tool options.

Preview the incoming commits and the files they touch, spot any conflicts, resolve each one in the diff editor, then finish and push the merge.

| Option | What it does | Cost |
|---|---|---|
| RepoYeti | Shows the incoming commits, the files they touch, and any conflicts they would cause before a pull. [^1] Shows differences in the Monaco editor to edit and save files. [^1] | Free for noncommercial use; commercial use costs US$79 per installation (per machine running the daemon), a perpetual licence with 12 months of updates [^1] |
| Visual Git client | Offers a graphical way to merge branches and shows file differences in the interface. | not published |
| Built-in editor resolver | Shows both versions of a conflicted file side by side inside a code editor. | not published |

## What you need before you start

Assemble the repositories that hold the changes you want to bring together and make sure each working copy is current on your local machine. Install a Git client with a graphical interface that can show incoming commits and display file differences. Know which branch is the target and which branch carries the new design work. Keep the design assets and style libraries the files depend on available, so visual changes can be checked while conflicts are resolved. Note any local changes that could overlap with the incoming work and decide whether to keep them or set them aside first. Also know how the team names branches and writes commit messages, so the merge fits the existing workflow. A clear picture of the branches, a ready working copy, and a GUI that shows differences will make the process straightforward.

## Step by step

1. Choose the target branch in the GUI, the branch where the design work should end up, and confirm it is the one the team merges into.

2. Fetch the latest changes so the client sees the newest commits and file versions from the remote.

3. Switch to the target branch with a working copy that is clean and up to date before starting the merge.

4. Use the preview feature to load the incoming commits and see which files they touch and which ones will conflict.

5. For each conflicted file, open the difference view and compare the local version with the incoming version side by side.

6. Decide which version to keep, or edit the file directly in the diff editor so both sets of changes are preserved, then save.

7. Mark the conflicts as resolved and confirm the merge in the GUI.

8. Commit the merge with a clear message that names the design task or feature so others can trace it later.

9. Push the merged branch to the remote so teammates see the updated design and can continue from it.

## Tools that can do it

RepoYeti is made by the team that publishes this site. Before a pull, RepoYeti shows the incoming commits, the files they touch, and any conflicts they would cause. [^1] When there are differences to resolve, RepoYeti shows them between the current work and the incoming changes in the Monaco editor, the editor used in VS Code, side by side or inline, and lets the designer edit and save the files from there. [^1] RepoYeti also draws a commit graph with lanes, merges and tags, so the branch relationships stay visible while the merge is being completed. [^1]

Standalone Git clients offer a graphical way to merge branches and show file differences. Check that a client displays conflicts clearly and provides an inline editor or an external diff tool for resolving them.

Some code editors bundle a visual conflict resolver that shows both versions of a file side by side. These can be enough when design files are edited in the same place as the code.

When comparing options, look at how each tool shows incoming commits, displays differences, and handles conflict resolution, as well as the operating systems it supports. Choose the one that matches the existing design workflow.

## Common mistakes to avoid

Starting a merge without previewing which files will conflict can overwrite design work unexpectedly. Skipping a fetch before the preview can hide newer commits and make conflict decisions outdated. Choosing one side of a conflict without checking the other version can drop changes the team still needs. Editing only the working copy and not the merged file can lose the resolved state. Leaving the merge uncommitted leaves the branch incomplete and unclear to others. Pushing late can let teammates keep working on a stale design. Test the merged result, commit with a clear message, and record the resolution so the branch stays readable.

## Frequently asked questions

### How can designers who commit preview conflicts before merging?

A GUI client can fetch the incoming commits, list the files they touch, and flag which files will conflict before the merge begins. RepoYeti shows the incoming commits, the files they touch, and any conflicts they would cause before a pull. [^1] Seeing the conflicts early lets a designer decide how to handle each change before completing the merge.

### What is the easiest way to edit a conflicted file in a GUI?

A graphical diff editor shows both versions of a file side by side and lets the designer keep one side, the other, or edit the file directly. RepoYeti shows the differences in the Monaco editor, the editor used in VS Code, and lets files be edited and saved there. [^1] Saving the resolved version is enough to finish the conflict.

### Can RepoYeti show branch relationships while merging?

RepoYeti draws a commit graph with lanes, merges and tags, and loads it in pages so large repositories open quickly. [^1] This keeps the branch relationships visible during a merge and helps a designer see where the incoming work sits in the history before deciding what to keep.

### Is RepoYeti free for design teams?

RepoYeti is free for noncommercial use, and commercial use costs US$79 per installation, a perpetual licence with 12 months of updates. [^1] That price applies to each machine running the daemon. Design teams should check the licence terms for their own situation before choosing RepoYeti.

### What should designers check before choosing a merge tool?

Check how the tool shows incoming commits, displays file differences, and handles conflict resolution, as well as the operating systems it supports. Confirm whether it has an inline diff editor or relies on an external tool. For RepoYeti, prebuilt binaries are available for Windows x64, Linux x64 and macOS on Apple Silicon. [^1]

Free for noncommercial use; commercial use costs US$79 per installation (per machine running the daemon), a perpetual licence with 12 months of updates. [^1] - [Visit RepoYeti](/go/start-repoyeti)

## Sources

[^1]: RepoYeti's own description of itself (the product of this site's publisher) (/go/start-repoyeti)