Hi All,

i'm kind of in a pickle.

For a very long time, i was the only developer. I stupidly didn't follow the proper branching protocol and ended up doing a significant amount of dev on a very large project in a single feature branch that spans over 1 year. I've had a few production releases over that year directly built from the code in that feature branch. Worse, I never merged those changes into the development branch. In the past 3 months, we've hired some contractors who have been following the proper branching and inevitably committing everything into development branch we have yet to release their code because we were waiting for my feature branch to be released.

I'm finally done with this feature branch and now all of that code is in prod. How do i get the feature branch back into development so that my history reflects that the feature branch is what's currently in production? I can't really do a merge if i want there to be proper history since it will merge the contractors code? Can i inject my feature branch commits into a specific time in the history of the development branch (maybe before the contractors started their dev)? I'm sorry if this is confusing.

Many thanks for helping me out.

Edit: I assume that i'll have to also only commit my feature branch to master adding more complexity. Thoughts?