Bridge for Git -Hook result: REJECTED - There is an encoding mismatch between the elements and the Endevor settings

Products

• Endevor

Issue/Introduction

There is an encoding mismatch between the elements and the Endevor settings.

A pull request has been created but user didn't select the correct branch .The  "Git-Bridge-service-branch". was selected instead 
As with I refresh my repository the component with the revert branch lost the update. I push again the new version to the good branch but this action generated those questions :

1- Are there consequences ?

2- How to perform a fallback ? 

3- If merge a branch from the Release 1 to the release 2 how do you unmerge it ?

Resolution

Since user merged the pull request to the service branch there will not be any consequence on bridge synchronisation. Because the service branch is not synchronised to Endevor.

How to perform a fallback ? 
Do the following:

1. Create a branch from the original branch that got reverted,
2. Cherry pick the commits that were merged to the service branch. This way the revert branch will be recreated.
3. Then revert the service branch to the original state, by reverting the commits which were added by the merge of the pull request.

If this happened to another synchronised branch - (release 1 revert branch pull request to release 2 ), most likely the pull request merge will be blocked because of different git history.
But if it gets merged without conflict, it will be the same steps as above.

• The consequence will be that the merged changes will get synchronised to Endevor but after reverting the commits the changes will be also reverted in Endevor.

Another case will be if it gets merged but the synchronisation with Endevor fails and another revert branch is created from release 2:

1. You need to create a branch from release 1
2. cherry pick the changes from the revert branch of release 2, and that recreates the revert branch of release.