git - In which order to rebase several differently old branches onto master? -

i searched through git docu , tower tutorial rebasing, didn't find suitable advice. age of branches maybe not matter, if there no conflicts? if does, is there general recommendation or rule of thumb, branch rebase first or last?

scenario: writing thesis, , having worked on different chapters/files in parallel, each different branch. on master branch, configurations pandoc or latex package settings changed, changes need integrated branch eventually. if in doubt, i'll merge, i'm curious rebase advice. thanks!

there no rule of thumb. because know changes have in each branch.

if touched same lines in different branches, have conflicts. no matter order decide, will.

choose order has logic/common sense purpose.

recommendation, when rebase, not lose old commits. happens new commits same changes created. if before rebasing create temporal branch. have kind of "backup" in case of goes wrong.

git checkout branchtorebase git branch tmp git rebase master gitk --all& // see here both, old commits , new ones. 

if went expected, have remove temporal branch.

git branch -d tmp 

you need uppercase "d" because git warn these commits going deattached reference.