We are planning to use a branch as a dev-pool requests. Every individual make some changes in his/her branch then push to dev-pool branch without editing trunk. When his/her changes go live, main trunk will be updated. In case of conflicting between two branches, we would like to partial merge two different branches just for the specific part. Are there any other option for these cases?
Thank you for your post. Currently, we only support merging a branch from or to the trunk. Merging between branches is not supported.