git rebase appends commits from feature to main
while merge combines all commits ?
merge conflicts
rebase: deal with them one by one (by commit?) merge: deal with them all at once
with a merge, feature branch commit timelines are intersected?
better vis
merge:
rebase
