I have my feature branch which has exceeded around 30 or more commits. Meanwhile in development branch few other features have been pushed from other developers. Therefore, Everytime a new feature is published on development, I am asked to:
- Rebase development branch onto my feature branch
- Resolve conflicts if any
- Continue developing in your feature branch
The problem
The second step is the chicken's neck here. On rebasing it gives me conflicts for every commit of that branch. This is really iterative and redundant. Note, I can't always rebase the development branch immediately since my own work in my branch remains in progress.
What I tried?
- To
squashand reduce my commits as much as possible (but this helps least, as most of the times there is nothing to squash) - To
stashmy on going changes, and rebase development and then unstash my changes. (but here, I get conflicts as well) - Using
-preserve-mergeswith rebase. (but everyone here shouts that using this is totally discouraged)
So, what is the optimal approach in dealing with rebasing development onto feature branch with least conflicts when the feature branch itself has numerous commits. I am a fresher, and so a reply with a helpful explanation (or link) will be of much help to proceed.
The workflow is sound (rebase).
But the conflicts should not be resolved every time over and over again.
For that, you have git rerere: activate it (git config --global rerere.enabled true), resolve the conflict one last time (or do a manual re-training, or use contrib/rerere-train.sh), and your next rebase will resuse those conflict resolution at your next rebase.
I would suggest to keep your feature small (one or two days), and your feature branch will be small as well. Another way would be to rebase not every time something got pushed to development branch but only sometimes, or just once before the merge. Again you need to keep the feature small or you will have too many conflics all at once.
About your question, you cannot minimize the number of conflics in a rebase. If there are conflics you cannot avoid them.
But there is one way git can help you: I suggest you to enable rerere which stands for reuse recorded resolution. With this, git records how you resolve a conflict and the next time the conflict appears, the resolution is reapplied so that you find the conflict already resolved. This sould speed up your workflow.
You can enable rerere globally with
git config --global rerere.enabled true
Try to git merge from the development branch into the feature branch before you perform the git rebase. It will be more informative in the way.
来源：https://stackoverflow.com/questions/45830434/how-to-rebase-my-feature-branch-to-development-branch-in-git-with-least-possible