Ya Basha Ya Basha - 4 months ago 19
Git Question

copy all non-conflict files between branches

I'm working on a branch

b
and I had some files changed on master after making the branch from other users, I want to copy all non-conflict files from
master
to my branch
b
. I don't want to do merge as I'm still working on the branch.

Thanx,

Answer

Run git rebase master when you are on your <branch>. What it will do basically, take your branch and bring ito the top index of master branch.

It looks something like this

rebase

Reference

Git Rebase