Documentation | Explain linear git history (#106)

[Gedare Bloom (@gedare)]

Gedare Bloom commented: https://gitlab.rtems.org/rtems/docs/rtems-docs/-/issues/106#note_121465


Merge commits should disappear if you `git pull --rebase` from the upstream repository, usually that will be `git pull --rebase origin main`. There is a way to prevent merge commits from happening by setting `git config pull.ff only`.
If you get conflicts during a rebase, you have to manually fix those conflicting files, use `git-add` on the files, and then `git rebase --continue`
After you have rebased on to a remote head and eliminated merge commits, then you can squash/edit your local history, using for example `git rebase -i HEAD~3` (see git tutorials/books how to use interactive rebasing).

-- 
View it on GitLab: https://gitlab.rtems.org/rtems/docs/rtems-docs/-/issues/106#note_121465
You're receiving this email because of your account on gitlab.rtems.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/bugs/attachments/20250320/ffc593c6/attachment-0001.htm>