Gedare Bloom commented on a discussion: https://gitlab.rtems.org/rtems/programs/gsoc/-/merge_requests/68#note_121397 try this... ``` $ git checkout gsoc:gsoc25 $ git pull --rebase origin main $ ... fix conflicts in tracking/2025.md ... $ git add tracking/2025.md $ git rebase --continue $ git rebase HEAD~2 -i squash the commits together using 'fixup' $ git push -f ``` -- View it on GitLab: https://gitlab.rtems.org/rtems/programs/gsoc/-/merge_requests/68#note_121397 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
