Since Git issue, incomprehensible disappearance of change in main
Hi everyone, Since we had a git issue revolved with TortoiseGit (project.mpr file conflict), somes changes disappear from the main branch after merging branches (like a entire module) and re-merging secondary branch doesn't make reappear the changes. Have you ever have this king of behavior ? What can we do to avoid this in the future ? And we don't know how restore a backup in the main branch, can you help us ? Thanks for you answer.
Did you happen to find reproduction steps for the issue you're describing? As I've also commented in the other question, if you find a reproducable case with meaningful changes (so not just moving an entity, but actually changing it), we'd love to hear about it in a ticket to get to the bottom of it.