cancel
Showing results for 
Search instead for 
Did you mean: 

Merge conflicts

Jesper_MCI
Associate II

So I got into some merge conflicts..

Fine I thought - they should be manageable.

Simple things in the .touchgfx file and some in texts.xml

 

But no matter what I do TouchGFX Designer cannot create assets.

It complains about merge conflicts in generated files - yes there are conflicts in generated files.
But that shouldn't matter since running the asset generation should overwrite those ... ?

 

It seems touchgfx does not clear the cache folders.

 

If I manually clear the cache folders I run into this error:

Done
Post Generate
touchgfx update_project --project-file=simulator/msvs/Application.vcxproj
C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/lib/touchgfx/generators/msvs_project_updater.rb:89:in `block (2 levels) in ensure_source_nodes': undefined method `downcase' for nil:NilClass (NoMethodError)
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/nokogiri-1.12.5-x64-mingw32/lib/nokogiri/xml/node_set.rb:239:in `block in each'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/nokogiri-1.12.5-x64-mingw32/lib/nokogiri/xml/node_set.rb:238:in `upto'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/nokogiri-1.12.5-x64-mingw32/lib/nokogiri/xml/node_set.rb:238:in `each'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/lib/touchgfx/generators/msvs_project_updater.rb:88:in `block in ensure_source_nodes'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/lib/touchgfx/generators/msvs_project_updater.rb:86:in `each'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/lib/touchgfx/generators/msvs_project_updater.rb:86:in `ensure_source_nodes'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/lib/touchgfx/generators/msvs_project_updater.rb:35:in `run'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/lib/touchgfx/generators/update_project.rb:115:in `run'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/lib/touchgfx/cli/inside.rb:48:in `update_project'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/thor-1.1.0/lib/thor/command.rb:27:in `run'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/thor-1.1.0/lib/thor/invocation.rb:127:in `invoke_command'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/thor-1.1.0/lib/thor.rb:392:in `dispatch'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/thor-1.1.0/lib/thor/base.rb:485:in `start'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/lib/touchgfx.rb:16:in `<module:CLI>'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/lib/touchgfx.rb:9:in `<module:TouchGFX>'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/lib/touchgfx.rb:8:in `<top (required)>'
from <internal:C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/3.0.0/rubygems/core_ext/kernel_require.rb>:85:in `require'
from <internal:C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/3.0.0/rubygems/core_ext/kernel_require.rb>:85:in `require'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/lib/ruby/gems/3.0.0/gems/touchgfx-cli-4.24.1/bin/touchgfx:6:in `<top (required)>'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/bin/touchgfx:23:in `load'
from C:/TouchGFX/4.24.1/env/MinGW/msys/1.0/Ruby30-x64/bin/touchgfx:23:in `<main>'
Failed
Failed

 

Anyone with any tips on how to proceed ?

This has cost me an entire work day so far, one I did NOT have to give away to this issue. So I am beyond frustrated!

1 ACCEPTED SOLUTION

Accepted Solutions
Jesper_MCI
Associate II

I finally got it solved.

I was so focused on the merge conflicts in the .touchgfx project file and the texts.xml file that I had completely overlooked the ones in the .vcxproj* files ( that I had actually handled in an earlier attempt which I couldn't see through because of something else disturbing at the time ).

I still feel I had to manually delete the two cache folders ( in assets/fonts and assets/texts ) - but I will not rule out the possibility that I did not need to do that had I solved the conflicts in the .vcxproj* files

 

View solution in original post

1 REPLY 1
Jesper_MCI
Associate II

I finally got it solved.

I was so focused on the merge conflicts in the .touchgfx project file and the texts.xml file that I had completely overlooked the ones in the .vcxproj* files ( that I had actually handled in an earlier attempt which I couldn't see through because of something else disturbing at the time ).

I still feel I had to manually delete the two cache folders ( in assets/fonts and assets/texts ) - but I will not rule out the possibility that I did not need to do that had I solved the conflicts in the .vcxproj* files