Skip to main content

By the abyss of my ignorance I invoke the knowledge of #fediverse: How to reconcile two very slightly diverging #git code base (namely https://git.savannah.gnu.org/git/liberty-eiffel.git and https://github.com/LibertyEiffel/ in few, different files)

Liberty Eiffel

Liberty Eiffel has 2 repositories available. Follow their code on GitHub.
GitHub

  • merge (100%, 1 vote)
  • rebase (0%, 0 votes)
1 voter. Poll end: 8 months ago

#fediverse #git
in reply to Paolo Redaelli

robinm
robinm
• •
If you are working with shared history (visible by more than 1 person) -> merge, otherwise -> rebase. The reason is that rebase has a lot of advantages but rewrite the history, and you don't want to beak other people workflow but forcing them to rewrite their own history by force-pushing the result of a rebase.

This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.

⇧