Gedare Bloom commented on a discussion: https://gitlab.rtems.org/rtems/programs/gsoc/-/merge_requests/68#note_121406 The merge commits should disappear if you `git-pull --rebase` from the upstream repository. If not, then you probably have to start over and try again. There is a way to prevent this from happening by setting `git config pull.ff only`. -- View it on GitLab: https://gitlab.rtems.org/rtems/programs/gsoc/-/merge_requests/68#note_121406 You're receiving this email because of your account on gitlab.rtems.org.
_______________________________________________ bugs mailing list bugs@rtems.org http://lists.rtems.org/mailman/listinfo/bugs
