How to force rebase when same changes applied to both branches manually?
- by Dmitry
My repository looks like:
X - Y- A - B - C - D - E branch:master
\ \
\ \ merge master -> release
\ \
M --- BCDE --- N branch:release
Here "M - BCDE - N" are manually (unfortunately!) applied changes approximately same as separate commits "A -…