Ff change folder structure

vr4vet / Blue-Sector

Virtual Reality app for exploring blue sector workplaces and professions.

MIT License

2 stars 0 forks source link

Ff change folder structure #408

Closed jonp-h closed 2 months ago

jonp-h commented 2 months ago

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...) Restructures the folder structure within the Fish Factory project.
What is the current behavior? (You can also link to an open issue here) Inconsistencies within the fish factory folder structure
What is the new behavior? (if this is a feature change) Improved folder structure
Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?) Yes. Almost all files have changed locations, and as such new files created after the branch must be moved to the correct folder.
Other information: No

mefriis commented 2 months ago

Merge conflicts?

jonp-h commented 2 months ago

Merge conflicts?

I get 801 empty merge conflicts, do you see any conflicting files @mefriis ? I'm asking because I'm confused..

mefriis commented 2 months ago

Merge conflicts?

I get 801 empty merge conflicts, do you see any conflicting files @mefriis ? I'm asking because I'm confused..

I says: Conflicting files Assets/FishFactory/Scripts/CutFishBody.cs Assets/FishFactory/Scripts/CutFishGill.cs Assets/FishFactory/Scripts/SceneLogic/SceneController.cs

jonp-h commented 2 months ago

Merge conflicts?

I get 801 empty merge conflicts, do you see any conflicting files @mefriis ? I'm asking because I'm confused..

I says: Conflicting files Assets/FishFactory/Scripts/CutFishBody.cs Assets/FishFactory/Scripts/CutFishGill.cs Assets/FishFactory/Scripts/SceneLogic/SceneController.cs

Strangely, none of these files are merge conflicts to me.. Channeling merge champion @MarkusJohansen

MarkusJohansen commented 2 months ago

I get the same conflicts as Mikkel. I would just suggest pulling local fish-factory into the branch with git pull --rebase fish-factory. If you are not familiar with the command, i suggest that you familiarize yourselves with it first.

There is also a significant difference in the amount of removed code vs additions - which i find peculiar. If we only restructured the project, the amounts should be about similar (if we just moved files). Can this be explained?

MarkusJohansen commented 2 months ago

Merge conflicts?

I get 801 empty merge conflicts, do you see any conflicting files @mefriis ? I'm asking because I'm confused..

I says: Conflicting files Assets/FishFactory/Scripts/CutFishBody.cs Assets/FishFactory/Scripts/CutFishGill.cs Assets/FishFactory/Scripts/SceneLogic/SceneController.cs

Strangely, none of these files are merge conflicts to me.. Channeling merge champion @MarkusJohansen

It seems like most of the files are meta files - maybe this is the reason for your conflicts? I only get three conflicts just like Mikkel.

jonp-h commented 2 months ago

Merge conflicts?

I get 801 empty merge conflicts, do you see any conflicting files @mefriis ? I'm asking because I'm confused..

I says: Conflicting files Assets/FishFactory/Scripts/CutFishBody.cs Assets/FishFactory/Scripts/CutFishGill.cs Assets/FishFactory/Scripts/SceneLogic/SceneController.cs

Strangely, none of these files are merge conflicts to me.. Channeling merge champion @MarkusJohansen

It seems like most of the files are meta files - maybe this is the reason for your conflicts? I only get three conflicts just like Mikkel.

Highly likely that this is just meta files yes, however I do not get the conflicting .cs files