View Issue Details

IDProjectCategoryView StatusLast Update
00291962.x IDE BugsSource ControlPublic2019-08-20 11:54
ReporterKevin BrownAssigned ToCoreTech 
PriorityHighSeverityB - MajorReproducibility100%
Status AssignedResolutionOpen 
Product Version2.1.3 
Target Version2.3.0Fixed in Version 
Summary0029196: Source Control: Git merging almost always ends in conflict due to .yyp file and views directory
DescriptionThe .yyp file and views directory in the current GMS 2 format is making it impossible to do multi-developer and multi-branch work without risking data loss through manual editing. They keep fighting over what their children are during a merge, even though the group structure has no relevance by compile time.

Attached is a trivial-case example where an identical object was added onto two different branches, dev-a and dev-b, then merged. The zipped file shows the conflicted state (.git directory included) when attempting to merge dev-a into a copy of dev-b (merge-a-into-b). What should have been a trivial merge is now a 2-file conflict, and any mistakes with UUIDs here would cause the object to be dropped.

A potential solution is listed here:
TagsIDE, source_control
2.x IDE Found In2.1.3.273
2.x Runtime Found In2.1.3.189
2.x IDE Verified In
2.x Runtime Verified In


Kevin Brown

2018-03-22 14:32

Manager (88,397 bytes)

Alexander Borup

2019-04-30 17:02

Developer   ~0063769

This should be resolved with the new format for 2.3.