Do all the things like ++ or -- rants, post your own rants, comment on others' rants and build your customized dev avatarSign Up
ddephor48723ygit is a bit strange with merges and the resulting graph, which leads to these 'overtaking' lines.
Rebase instead of merge avoids this and keeps the graph clean.
What do you think is wrong with your graph?
Wanna see a part of one of my projects? Doesn't look better:
Which is more recommended rebase or merge?
mt3o20803y@gitpush depends. I rather use merge because it helps keeping track of what happens during development of single feature. With rebase its harder to track given commits if you have to work with the history.
If you do a pull request, always do a rebase. Get their code and treat yours as 'written after their last commit'. Its easier to the maintainer.