Sobre

We are looking for an experienced Git master to assist our team with merging open pull requests and optimizing our Gitflow process. The ideal candidate will have a strong understanding of Git and experience managing complex repositories. Currently, we have an issue to address. Our team creates feature branches from the main or master branch, and when we need to submit a pull request (PR), we often encounter conflicts. The challenge arises because we cannot integrate changes from the development branch into our feature branch without pulling in code from other features. Our plan is that once a PR is merged, our QA team will test the feature. Once it is approved by QA, the feature branch will be merged into the main or master branch for deployment. How can we merge our feature branch when there are conflicts without merging changes from the development branch into it? We want to resolve conflicts while keeping the PR open for client review and ensuring that it can still be merged afterward.