[BUILDTOOLS-455] BuildTools failing to build due to merge conflicts Created: 06/May/19  Updated: 06/May/19  Resolved: 06/May/19

Status: Resolved
Project: BuildTools
Component/s: None
Affects Version/s: None
Fix Version/s: None

Type: Bug Priority: Major
Reporter: Daniel Pham Assignee: Unassigned
Resolution: Invalid Votes: 0
Labels: 1.14, bug, error, spigot

Attachments: Text File BuildTools.log.txt    
Version: 101
Guidelines Read: Yes

 Description   

BuildTool fails to build latest version when run as stated from official installation page

Here is a snippet

Applying: Spigot Configuration
Using index info to reconstruct a base tree...
A src/main/java/net/minecraft/server/DedicatedServer.java
error: Failed to merge in the changes. A src/main/java/net/minecraft/server/World.java

Falling back to patching base and 3-way merge...

CONFLICT (modify/delete): src/main/java/net/minecraft/server/World.java deleted in HEAD and modified in Spigot Configuration. Version Spigot Configuration of src/main/java/net/minecraft/server/World.java left in tree.

CONFLICT (modify/delete): src/main/java/net/minecraft/server/DedicatedServer.java deleted in HEAD and modified in Spigot Configuration. Version Spigot Configuration of src/main/java/net/minecraft/server/DedicatedServer.java left in tree.

Patch failed at 0004 Spigot Configuration
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
  Something did not apply cleanly to Spigot-Server.
  Please review above details and finish the apply then
  save the changes with rebuildPatches.sh
Error compiling Spigot. Please check the wiki for FAQs.
If this does not resolve your issue then please pastebin the entire BuildTools.log.txt file when seeking support.
java.lang.RuntimeException: Error running command, return status !=0: [sh, applyPatches.sh]
 at org.spigotmc.builder.Builder.runProcess0(Builder.java:764)
 at org.spigotmc.builder.Builder.runProcess(Builder.java:699)
 at org.spigotmc.builder.Builder.main(Builder.java:564) at org.spigotmc.builder.Bootstrap.main(Bootstrap.java:40)

 

 



 Comments   
Comment by md_5 [ 06/May/19 ]

Please install a recent git version, or let BuildTools use its own version.

The version you somehow installed is outdated and bugged

Generated at Mon Dec 15 03:11:35 UTC 2025 using Jira 10.3.13#10030013-sha1:56dd970ae30ebfeda3a697d25be1f6388b68a422.