Fullscreen Branch

Hello there,

how can I merge the fullscreen branch into the master branch? I just cloned the fullscreen branch and tried a git merge origin/master but this merge fails because of a conflict: CONFLICT (content): Merge conflict in MonoGame.Framework/Properties/AssemblyInfo.cs

The problem is that I can’t seem to use the fullscreen branch by itself, because it doesn’t include the .cs project files that I am using with my current project. Everything works fine there, except switching to fullscreen on Linux. The fullscreenfix branch sounds very promising here… :wink:

Just use the fullscreen branch by itself. MonoGame has switched to protobuild, which automatically generates the project files. Just run Protobuild.exe in the root of the repository.

Aha okay, many thanks!