I'm working a huge feature that can't be released in parts so I'm working on a feature branch. Every few weeks or so I try and do a rebase to keep myself up to date with dev.
The bit of code I'm working is nicely separated from the rest of the code so why do I end up having to re-fix merges that have already been made on the branch I'm rebasing from?
What's likely happening? What do we change to stop it happening?