Developing on branch and merging to trunk?

Unknown

Developing on branch and merging to trunk?

Unknown

Hello, I was wondering about best development practices. I am having an issue where when I get an ok to push something to production I am always in the process of doing another ticket for the same project or there are tickets for that project that has yet to go through QA. So if i want to push something all of the stuff that has yet to go through QA gets pushed out as well. I know in normal development you would create a branch of the code base, do your development, and when it is time you merge the branch to trunk and then push trunk to production. We have two people who develop in Decisions and we may be working on the same project at the same time so we would want to merge both to trunk and be able to check for conflicts. Is anything like that available in Decisions and if not what the best practice for this situation would be.