Merging strategy with a long development branch. How to prevent heavy conflicts in the future merge?

Question

I'm developing a project where I constantly want to make small improvements on master branch and push them to production. I have problem because I want to concurrently work on a branch that will be pushed only after a long time.

If I will use different branches on long_project and not merge them immediately, one branch will be much ahead. When I will want to launch long_project branch to production, will I able to merge it to master without destroying all minor work I have done on master?

So, how can merge them after a while without destroying any minor changes that I make every day on master branch?

Answer 1

What I would do is, after making a small change on master, merge master into long project. That way when you merge long project into master, there will be fewer (if any) conflicts.