Git-Cheatsheet Git pull features from another repo git pull upstream master --allow-unrelated-histories Git resolve conflict - Accept incoming git checkout --theirs .