Git Merge now cant open file!

This forum can be browsed by the general public. Posting is limited to current SAPIEN license holders with active maintenance and does not offer a response time guarantee.
Forum rules
DO NOT POST LICENSE NUMBERS, ACTIVATION KEYS OR ANY OTHER LICENSING INFORMATION IN THIS FORUM.
Only the original author and our tech personnel can reply to a topic that is created in this forum. If you find a topic that relates to an issue you are having, please create a new topic and reference the other in your post.

Any code longer than three lines should be added as code using the 'Select Code' dropdown menu or attached as a file.
This topic is 5 years and 1 week old and has exceeded the time allowed for comments. Please begin a new topic or use the search feature to find a similar but newer topic.
dfroling
Posts: 1
Last visit: Sun Aug 04, 2019 8:33 pm

Git Merge now cant open file!

Post by dfroling »

Good Morning,

After merging conflicts on git in the .psf file (the preview xml block was the conflict) I can no longer open my project, with the error:
Name cannot begin with the '<' character, hexadecimal value 0x3C. Line 4, position 2.
Unable to determine object class.
Object reference not set to an instance of an object.

Is there some process that should be follow to stop this happening? Using PS Studio 2019 if that helps

Thanks and Regards,
User avatar
brittneyr
Site Admin
Posts: 1654
Last visit: Wed Mar 27, 2024 1:54 pm
Answers: 39
Been upvoted: 30 times

Re: Git Merge now cant open file!

Post by brittneyr »

[TOPIC MOVED TO POWERSHELL STUDIO FORUM BY THE MODERATOR]
Brittney
SAPIEN Technologies, Inc.
User avatar
Alexander Riedel
Posts: 8478
Last visit: Tue Mar 26, 2024 8:52 am
Answers: 19
Been upvoted: 37 times

Re: Git Merge now cant open file!

Post by Alexander Riedel »

Without looking at the actual file and by seeing what was merged with what, this is hard to tell.
Quickest way for you to resolve this is probably to restore a previous version and manually merge any code changes.
Alexander Riedel
SAPIEN Technologies, Inc.
User avatar
davidc
Posts: 5913
Last visit: Mon Jul 08, 2019 8:55 am
Been upvoted: 2 times

Re: Git Merge now cant open file!

Post by davidc »

Sounds like Git broke the encoded block in the psf file when it merged the file. There might be a way to prevent merging of the psf file extension. I recommend investigating the .gitattributes file.
David
SAPIEN Technologies, Inc.
This topic is 5 years and 1 week old and has exceeded the time allowed for comments. Please begin a new topic or use the search feature to find a similar but newer topic.