Sebastian Huber commented on a discussion: https://gitlab.rtems.org/rtems/rtos/rtems/-/merge_requests/1122#note_146785 I am not sure if Git is able to sort this out. We would have a situation like this: ``` -> reformatted baseline (format B) ----------> customization (format B) ^ | -> other format (format A) -> customization (format B) -/ ``` -- View it on GitLab: https://gitlab.rtems.org/rtems/rtos/rtems/-/merge_requests/1122#note_146785 You're receiving this email because of your account on gitlab.rtems.org.
_______________________________________________ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
