search

winstxnhdw / lc-hax

A powerful, feature-rich and highly performant internal cheat for the co-op indie horror video game, Lethal Company.
77 stars 25 forks source link

[Bug]: Error when launching (merge conflict) #464

Closed joep26020 closed 3 months ago

joep26020 commented 3 months ago

What happened?

error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. MSBuild version 17.8.5+b5265ef37 for .NET Determining projects to restore... Restored C:\Users\kaide\lc-hax\lc-hax\lc-hax.csproj (in 810 ms). 1 of 2 projects are up-to-date for restore. analysers -> C:\Users\kaide\lc-hax\analysers\bin\Release\netstandard2.1\analysers.dll C:\Users\kaide\lc-hax\lc-hax\Scripts\Static\State.cs(1,1): error CS8300: Merge conflict marker encountered [C:\Users\ka ide\lc-hax\lc-hax\lc-hax.csproj] C:\Users\kaide\lc-hax\lc-hax\Scripts\Static\State.cs(4,1): error CS8300: Merge conflict marker encountered [C:\Users\ka ide\lc-hax\lc-hax\lc-hax.csproj] C:\Users\kaide\lc-hax\lc-hax\Scripts\Static\State.cs(9,1): error CS8300: Merge conflict marker encountered [C:\Users\ka ide\lc-hax\lc-hax\lc-hax.csproj]

Build FAILED.

C:\Users\kaide\lc-hax\lc-hax\Scripts\Static\State.cs(1,1): error CS8300: Merge conflict marker encountered [C:\Users\ka ide\lc-hax\lc-hax\lc-hax.csproj] C:\Users\kaide\lc-hax\lc-hax\Scripts\Static\State.cs(4,1): error CS8300: Merge conflict marker encountered [C:\Users\ka ide\lc-hax\lc-hax\lc-hax.csproj] C:\Users\kaide\lc-hax\lc-hax\Scripts\Static\State.cs(9,1): error CS8300: Merge conflict marker encountered [C:\Users\ka ide\lc-hax\lc-hax\lc-hax.csproj] 0 Warning(s) 3 Error(s)

Time Elapsed 00:00:01.87 Unhandled exception: System.IO.FileNotFoundException: Could not find file 'C:\Users\kaide\lc-hax\bin\lc-hax.dll'. File name: 'C:\Users\kaide\lc-hax\bin\lc-hax.dll' at Microsoft.Win32.SafeHandles.SafeFileHandle.CreateFile(String fullPath, FileMode mode, FileAccess access, FileShare share, FileOptions options) at Microsoft.Win32.SafeHandles.SafeFileHandle.Open(String fullPath, FileMode mode, FileAccess access, FileShare share, FileOptions options, Int64 preallocationSize, Nullable1 unixCreateMode) at System.IO.File.OpenHandle(String path, FileMode mode, FileAccess access, FileShare share, FileOptions options, Int64 preallocationSize) at System.IO.File.ReadAllBytes(String path) at Program.<<Main>$>g__Inject|0_0(String targetProcess, FileInfo assembly, String loaderNamespace, String loaderClass, String loaderMethod) at System.CommandLine.Handler.<>c__DisplayClass6_05.b0(InvocationContext context) at System.CommandLine.Invocation.AnonymousCommandHandler.Invoke(InvocationContext context) at System.CommandLine.Invocation.InvocationPipeline.<>cDisplayClass4_0.<b0>d.MoveNext() --- End of stack trace from previous location --- at System.CommandLine.Builder.CommandLineBuilderExtensions.<>cDisplayClass17_0.<b0>d.MoveNext() --- End of stack trace from previous location --- at System.CommandLine.Builder.CommandLineBuilderExtensions.<>cDisplayClass12_0.<b0>d.MoveNext() --- End of stack trace from previous location --- at System.CommandLine.Builder.CommandLineBuilderExtensions.<>cDisplayClass22_0.<b0>d.MoveNext() --- End of stack trace from previous location --- at System.CommandLine.Builder.CommandLineBuilderExtensions.<>cDisplayClass19_0.<b0>d.MoveNext() --- End of stack trace from previous location --- at System.CommandLine.Builder.CommandLineBuilderExtensions.<>c.<b18_0>d.MoveNext() --- End of stack trace from previous location --- at System.CommandLine.Builder.CommandLineBuilderExtensions.<>cDisplayClass16_0.<b0>d.MoveNext() --- End of stack trace from previous location --- at System.CommandLine.Builder.CommandLineBuilderExtensions.<>c.<b5_0>d.MoveNext() --- End of stack trace from previous location --- at System.CommandLine.Builder.CommandLineBuilderExtensions.<>cDisplayClass8_0.<b__0>d.MoveNext() Press any key to continue . . .

Current Commit Hash

grr4

Injector

If you selected "Others" above, please specify the injector you are using.

No response

Log output

No response

Acknowledgement

winstxnhdw commented 3 months ago

You have to discard your changes; which you can do by doing git reset —hard. Or re-clone, which works the same.

winstxnhdw commented 3 months ago

Seems like you changed something in State.cs. You should remove that.

joep26020 commented 3 months ago

Seems like you changed something in State.cs. You should remove that.

Ok, will do.