Unable to merge changes. Git command line client has exited with code 128

0
Unable to merge changes. Git command line client has exited with code 128   how to resolve this error ? the commit was successful, but when merging or push or pull, this error occurs. please let me know the solution 
asked
3 answers
4

Hello Niveditha,

 

Please check below.

 

Mendix Community - Question Details

 

 

Mendix Community - Question Details

 

Mendix Community - Question Details

 

 

answered
0

Hi Niveditha,

 

This can be happened due to certain reasons. are you using CMD to commit the code or Studio pro? 

lets assume you are using CMD the try to follow the steps. 

1. git pull 

2. git commit -m "msg"

3. git push origin <main>

 

answered
0

To address the issue you're encountering, there are two potential solutions:

Option 1: Using the Command Line (Terminal or Git Bash)

  1. Open your project folder in the terminal or Git Bash.

  2. Run the following commands:

    • git fetch origin — This will fetch the latest changes from the remote repository.

    • git merge origin/<your-branch-name> — This will merge the remote changes into your current branch.

  3. If there are any conflicts, resolve them manually.

  4. After resolving the conflicts, stage the changes using:

    • git add .

  5. Commit the changes with an appropriate message:

    • git commit -m "Your commit message"

Option 2: Using Git GUI

  1. Open your Git GUI client.

  2. Inspect the unversioned files and any potential conflicts.

  3. Pull the latest changes to resolve any discrepancies.

Either of these methods should help resolve the error you're experiencing.

I hope this helps! Let me know if you need further clarification.

answered