Community Forums: Problem with custom sheet | Roll20: Online virtual tabletop

Problem with custom sheet

1750721107

Sheet Author

Hello, In Visual Studio the code is like this: When placing the file on github, the code looks like this: Just one question: WHY? What's wrong with this system? This has never happened before, all other editions have been smooth, but this one is presenting some conflict that I don't know what to do. I depend on roll 20 support at this time.

1750728884

Edited 1750728938

vÍnce

Pro

Sheet Author

Permalink Quote

Hi Victor, did you make code changes on multiple branches (intentionally or accidentally) over the same code?  You should be able to resolve any conflicts by updating your latest branch with the desired code and making a new commit to your git pull request. I believe that would resolve the conflicts you are seeing.

1750733937

Scott C.

Forum Champion

Sheet Author

API Scripter

Compendium Curator

Permalink Quote

Yep, this is an issue where a merge conflict happened at some point and wasn't properly resolved. I'd recommend looking through the git guide on the wiki and using the command line interface workflow outlined there to avoid issues; the GUI's feedback on issues just isn't as good.

1750734385

Victor H.

Sheet Author

Permalink Quote

thanks. I deleted the line ">>>>>>>> master" and everything was resolved. I still don't understand what that was.

Cookie Preferences

Problem with custom sheet