git branch is behind master for too many commits -- most efficient way to rebase? -

When I do git rebase master , then I have to protest against every committed one I was behind It's a pain

Is this a way to make SVN style - I only compare with the latest snapshot, then once for the struggle and solve for the best.

The easiest way to merge only master to the branch Question will be This will obviously ask for conflict resolution only once.

Alternatively, if you have to deal with conflicts always, you can see once; As the name suggests, it records the proposals applied for a protest and will resolve such disputes automatically in the future.