How to rebase my feature branch to development branch in git with least possible conflicts?

Question

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:

1. Rebase development branch onto my feature branch
2. Resolve conflicts if any
3. 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?

1. To squash and reduce my commits as much as possible (but this helps least, as most of the times there is nothing to squash)
2. To stash my on going changes, and rebase development and then unstash my changes. (but here, I get conflicts as well)
3. Using -preserve-merges with 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.

Answer 1

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.