Suresh Lingam
TFDThoughtSpot For Developers
•Created by Rondel on 10/15/2024 in #help
Cannot pull into a repository with state: REBASING_MERGE
We have fixed this issue by 10.4 onwards which can ease the process
Approach 2 (Available from version 10.4 onwards):
- Connect to the customer's local terminal.
- Run the following command, which will be available from version 10.4 onwards:
- curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' 'http://172.32.91.150:8088/callosum/v1/v2/vcs/git/abort-rebase'
After completing these steps, retry the operation the customer was performing.
This should resolve the issue.
5 replies
TFDThoughtSpot For Developers
•Created by Rondel on 10/15/2024 in #help
Cannot pull into a repository with state: REBASING_MERGE
Hey @shikharTS ,
Here are the steps to resolve this issue:
Approach 1:
- Connect to the backend and install Git CLI on the cluster.
- Navigate to the path /export/<Folder that starts with x>/git.
- Run the command git branch. You should see a detached branch, as a rebase is currently in progress.
- Run the following commands:
git rebase --abort git reset --hard HEAD^After completing these steps, retry the operation the customer was performing. This should resolve the issue.
5 replies