git

1.git MERGE vs REBASE

post-thumbnail