version control rebasing merging git
See more