YaCo is an Hex-Rays IDA plugin. When enabled, multiple users can work simultaneously on the same binary. Any modification done by any user is synchronized through git version control.
GNU General Public License v3.0
313
stars
36
forks
source link
Problem on a merge when there is a conflict on structures #11
initially reported by dlul in issue #10, splitting in 2 bugs
When there is a conflict with a structure (user1 applies "toto.fieldA" and user2 applies "titi.fieldB" on the same line), the conflict is not detected, thus the last one that saves the IDB overwrites the structure.
initially reported by dlul in issue #10, splitting in 2 bugs
When there is a conflict with a structure (user1 applies "toto.fieldA" and user2 applies "titi.fieldB" on the same line), the conflict is not detected, thus the last one that saves the IDB overwrites the structure.
Tested with IDA Linux 6.95.