git - How do I reword a commit (message) that is the parent of two branches? -
suppose have repo this $ git log --oneline --graph * 3e0a28f merge branch 'other_branch' |\ | * d4fd67a add else | * d0f16bf merge branch 'master' other_branch | |\ | |/ |/| * | 3684fe5 make change in master | * 45b3ecb make change |/ * b2a9034 added text, reword me * 7b1ac57 initial commit d0f16bf involves fixing merge conflicts. ( 3684fe5 , 45b3ecb modify same line). want reword b2a9034 $ git rebase -i b2a9034^ [detached head a9bd978] added text, reworded 1 file changed, 2 insertions(+) error: not apply 3684fe5... make change in master when have resolved problem, run "git rebase --continue". if prefer skip patch, run "git rebase --skip" instead. check out original branch , stop rebasing, run "git rebase --abort". not apply 3684fe570517de37e1ce7661e3821372e1eee967... make change in master is there way reword b2a9034 without fixing merge conflicts again? when "reword" assume mean "ch...