Disclosure: This draft was generated with AI and checked against the cited primary sources, with a separate AI editorial review. It was prepared for the FrameSprite team, which has a commercial interest in FrameSprite. Proposed examples are not executed tests unless explicitly identified as recorded fixture results.
Keep both branch versions before resolving a conflict in a sprite PNG. Decide which visual intentions to retain, rebuild the combined result in an image editor, and then review the texture with its companion metadata. Selecting one branch resolves the file conflict but does not automatically preserve the other artist's work.
Key Takeaways
- Treat each conflicting PNG as a candidate, not a text patch.
- Preserve both originals outside the active destination before editing.
- Revalidate the combined result and its export settings.
Separate Git resolution from art reconciliation
Git merge combines repository histories and reports conflicts it cannot resolve. That process has no knowledge of why one artist widened a shield while another corrected its palette. A syntactically resolved repository can still contain a visually incomplete decision.
First ask each contributor what changed and which source file produced the export. Record the branch or commit identifier with the candidate. Preserve the editable masters when available. A flattened PNG may not retain the layers needed to combine both changes cleanly.
Avoid opening two files with the same display name in an editor and relying on tab position. Give the review copies temporary descriptive names, such as shield-grip-candidate.png and shield-palette-candidate.png, while preserving the original production path separately.
Reconstruct the intended result
Compare candidates against their common starting version. The Git diff reference explains repository comparisons, but the actual pixel and design review needs an appropriate image viewer or editor. A large byte difference does not identify which change is artistically important.
Make an intent list: preserve the new grip, keep the approved outline, adopt the revised metal colors, and leave the canvas size unchanged. Apply these decisions to a recoverable master. If the changes cannot coexist, have the art owner choose and document the tradeoff rather than inventing an automatic blend.
Export the reconstructed candidate to a new review location first. Keep the conflict candidates until the combined file passes review. Only then replace the production destination through the team's normal version-control workflow.
Example: two good fixes that do not combine automatically
One branch moves a sword hand three pixels inward to improve contact. Another branch paints a brighter guard over the old hand position. Choosing the first loses the color correction; choosing the second restores the bad grip. Overlaying both can create a double edge.
The combined master needs the new hand position and a repaint of the guard around that position. Compare the final silhouette and all frames where the hand is occluded. If attachment coordinates refer to the earlier position, revise those records alongside the texture.
Acceptance after the conflict is gone
Git add stages the selected content for the next commit. Before staging, confirm that the file you are adding is the reconstructed candidate rather than one of the temporary review copies.
Acceptance should include the intended visual changes, unchanged dimensions unless approved, valid frame order, matching sidecars, and a preview generated from the final file. Ask both contributors to confirm their relevant intention survived. Their agreement concerns the content, not merely the absence of merge markers.
This worked scenario is illustrative and was not executed in an editor or game engine. Do not use a blanket preference for either branch as a general conflict policy.
Continue the workflow
Use the How do I compare art revisions while changing one decision at a time? for the neighboring problem. Keep the animation handoff checklist with the delivered package, and preserve its visual decisions in the game-art reference board.
Sources and editorial responsibility
Prepared by the FrameSprite Workflow Team. See the editorial method or contact the team with a reproducible correction. Sources checked 2026-10-20.
Top comments (0)