CODEWITHSUNDEEP
gitlabgit-rebaseconventional-commitsgithub-flow
codeangler
codeangler

Reputation: 877

error: Merge failed: Something went wrong during merge: 3:invalid byte sequence in US-ASCII. Please try again. on GitLab

Using GitLab

Received the following error message.

Merge failed: Something went wrong during merge: 3:invalid byte sequence in US-ASCII. Please try again.

enter image description here

solution to follow.

Upvotes: 0

Views: 1587

Answers (1)

codeangler
codeangler

Reputation: 877

We have a regex pattern on the Commit Messages to enforce a part of the conventional commits that were added after the initial few commits made on the project. Example of regex answered here on stackoverflow

Merge into Master failed

two commits don't follow conventional commit messages.

 * 119a135 - (HEAD -> master) docs(devops): a primer (6 minutes ago) <Casey Burnett>
 * beb03e6 - Add contribution guide (6 minutes ago) <Guy>  ### Note to Stackoverflow: this is missing type
 * f314c3e - initial commit (6 minutes ago) <Guy>  ### Note to Stackoverflow: git boilerplate is case sensitive to `Initial commit`
 * 4d04254 - Initial commit (8 weeks ago) <Mr. Robot>

A Solution

git checkout master
git rebase -i HEAD~4

follow prompts of interactive git-rebase and update two commits to "reword". An additional resource for git-base interactive

For us, because we follow GitHub flow, I merged the updated master into my working branch and pushed it up for review.

git checkout docs/conventional-commit-examples
git merge master
git push origin docs/conventional-commit-examples

Upvotes: 0

Related Questions