Skip to content

Latest commit

 

History

History
25 lines (20 loc) · 913 Bytes

README.md

File metadata and controls

25 lines (20 loc) · 913 Bytes
Raw

B4X_conflict_fixer

A WPF GUI tool to fix git conflicts in a B4X project file.

Never again will you need to quake in fear when you see this:

image

Features

This tool will fix the following:

  • File conflicts
  • File Group conflicts
  • Module conflicts
  • Module Group conflicts
  • Group conflicts
  • Library conflicts
  • B4X Version conflicts
  • Manifest conflicts
  • Build conflicts

Usage

Download the latest release from the releases page, and run B4X_conflict_fixer.exe.
Enter the path to your B4X project file and click "Fix Conflicts". Easy.

Note

Because I'm not an all powerfull AI programmer, this tool only fixes conflicts in the file header. Any code conflicts will need to be fixed manually by you.