We are having an issue with DPC and Matillion supplied GIT where we made a change to DEV branch but when we tried to push to QA branch, suddenly DPC identifies 14 changes in the QA branch out of nowhere (they are previous changes that were made). Assuming that the MAIN branch is correct AND the DEV + QA branches do not have any significant changes we cannot redo, CAN we safely DELETE the DEV and QA branches then clone the MAIN branch back into new separate DEV and QA branches?
We are a small team of 5 people so each user will probably need to reset each persons local copies.
I’m not getting a lot of help from Matillion tech support at the moment.
Thanks for your post, I wanted to dig a little deeper, just to confirm you have made a change in the DEV branch which you have committed and pushed.
When you mention you have tried to push to a QA branch, do you mean you are trying to merge from the remote DEV branch to your local QA branch? If you no longer need the 14 changes in QA branch, you can go to the Git menu, click Reset branch and select Reset to latest remote commit.
That will sync your QA branch with what’s in remote.
I hope that helps, please keep me posted and let me know if there is anything else I can help with.
Hi @Joe-Community-Manager A developer mad a minor change to his local copy of the DEV branch (he previously reset if local copy to ensure he had the latest copy. He made the change and committed the change and then pushed it to the remote repo DEV branch. He then tried to merge the change in DEV with a local copy of QA. This is when 14 changes suddenly appeared. It seems like the QA branch is messed up. Support has been slow to deal with the ticket we have (I think due to illness).
