search

Team-Awkward-Smile / Epilogue

A 2D side-scroller game inspired by Contra, Splatterhouse, Doom, and works of HR Gieger.
MIT License
3 stars 0 forks source link

419 make sfx for hestmor rolling in flesh #573

Closed Hhk187 closed 1 month ago

Hhk187 commented 1 month ago

Added hestmor rolling in flesh, been tested and approved by @vitormaduro and @Pseudo-64

Hhk187 commented 1 month ago

seems like there is conflict huh

vitormaduro commented 1 month ago

@Hhk187 There are merge conflicts with this branch. Please fix them so I can merge

Hhk187 commented 1 month ago

how am i suppose to fix this? these are important files, its not like i can just delete them, and also what's the conflicts inside these files, because i've got no information here.

vitormaduro commented 1 month ago

In VS Code you can use the git pull origin develop command to merge the changes from develop into your branch. This will show you which files have conflicts and you'll be able to solve them manually

Hhk187 commented 1 month ago

the conflict inside "Slide.cs"was a "space" -_- image

Hhk187 commented 1 month ago

Ok its done, i've solved the conflicts and merged. Can i delete the branches since they not useful anymore?