Roll20 uses cookies to improve your experience on our site. Cookies enable you to enjoy certain features, social sharing functionality, and tailor message and display ads to your interests on our site and others. They also help us understand how our site is being used. By continuing to use our site, you consent to our use of cookies. Update your cookie preferences .
×
Create a free account

Problem with custom sheet

June 23 (1 month ago)
Victor H.
Pro
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.

June 24 (1 month ago)

Edited June 24 (1 month ago)
vÍnce
Pro
Sheet Author

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.

June 24 (1 month ago)
Scott C.
Forum Champion
Sheet Author
API Scripter
Compendium Curator

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.

June 24 (1 month ago)
Victor H.
Pro
Sheet Author

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