|
|
|
|
|
|
by Arelius
848 days ago
|
|
|
> thus a rebase in git is not required. A rebase is never required in Git. (people/maintainers may disagre) but a merge will always do. Having said that. In your scenario provided, a pull + merge/rebase will be required. It will then resolve automatically, and without conflicts. But a human has to be involved to provide a strict sequence/dag of the those commits. |
|
|