Rebase a branch that has child branches
git
Solution
Try first do rebase dev while preserving merges:
git checkout Dev
git rebase --preserve-merges master
That should keep task1 and 2 correctly rebased as well.
See "What exactly does git's “`rebase --preserve-merges`” do (and why?)"
Problem
My company's policy is that any pull request must be done with a rebased branch. I have a local Dev branch and this has 'task' branches: ``` remote master -------- \ Dev ------------------ \-----task1 \ \---task2 ``` When master gets updated, I rebase Dev on master. What is a optimal way to manage branches task1 and task2. They are still being worked on. Rebasing each task branch seems like the only way I can see.