View Issue Details

IDProjectCategoryView StatusLast Update
00284692.x IDE BugsSource ControlPublic2021-07-16 14:05
ReporterSam CummingAssigned ToCoreTech 
PriorityLowSeverityC - GeneralReproducibility100%
Status ResolvedResolutionFixed 
Product Version 
Target VersionFixed in Version 
Summary0028469: Source Control: Choosing 'Use Theirs/Mine' does not clean script of git messages or reflect your changes
DescriptionIf you have a source control conflict in a script and choose to reload the script so that it shows git messages, their code and your code, when you click 'Use Theirs' or 'Use Mine', the script is not updated with Their or Mine code. This makes the script unusable until you reload it manually or strip out the undesired code.

When you press 'Use Mine' or 'Use Theirs', the IDE should update the script with your choice so that your change is ready to be used immediately.
Steps To Reproduce1. Open two different projects that share a repo.
2. Add a script on one IDE, add some code, push it.
3. Pull with the other IDE.
4. On both IDEs, make different changes to the code, then push both.
5. One of the pushes will fail, pull instead.
6. You will have a merge error. Reload the file when prompted.
7. Observe git messages in code. Select 'Use Theirs'.
8. Observe how the script is not updated with your selection.
TagsIDE, source_control
2.x IDE Found In2.1.3.265
2.x Runtime Found In2.1.3.183
2.x IDE Verified In
2.x Runtime Verified In

Activities

Dan

2021-07-16 14:05

Adminstrator   ~0066371

Has been fixed or made invalid by changes in recent versions of GMS2. Closing.