Rondel Posts - Answer Overflow

Rondel

•Created by Rondel on 10/15/2024 in #help

Cannot pull into a repository with state: REBASING_MERGE

I'm running into a situation where I'm unable to deploy to one of my target branches and getting an error Cannot pull into a repository with state: REBASING_MERGE I did do a force push to the branch (Branch B) and attempted to go back to the original commit hash but this error still appears. Oddly enough, it is now impacting my commit branch (Branch A) for another org and I'm unable to find a workaround for it. Branch A was not rebased at any point but I did attempt to get Branch B on the same commit hash as A. Attempting to make a whole new git configuration with new branches is also not working for me. In those cases I'm getting "Conflict" errors even though there should be no difference between the content since the branches are on the same commit. I'm pretty stuck now with no way to resolve this problem. Is there any way to clear this "Rebasing Merge" stage?

5 replies

TFDThoughtSpot For Developers

•Created by Rondel on 9/24/2024 in #help

Error 500 on Deploy API

I am getting a 500 error when attempting to use the POST /api/rest/2.0/vcs/git/commits/deploy API to deploy my TS objects from source control when using a .NET HttpClient. We use this HttpClient to automate the deploy process using Github actions. I get the 500 error whether I use VALIDATE_ONLY or PARTIAL. 500

{"error":{"message":{"debug":{"code":13000,"incident_id_guid":"e5cf314e-45dc-446d-8055-4a963de80eee","debug":"Index: 1, Size: 1"}}}}

Working with TS support, they were able to find the deploy logs that contain the issue with the objects that couldn't be deployed. However, if I run the same API using the Playground or even Postman, I am able to get a 200 response with the actual warnings/errors that were a part of the deployment. The request I am sending from my code is identical

{
  "branch_name": "pfload",
  "deploy_type": "FULL",
  "deploy_policy": "VALIDATE_ONLY"
}

{
  "branch_name": "pfload",
  "deploy_type": "FULL",
  "deploy_policy": "VALIDATE_ONLY"
}

The only thing I can assume is that this is related in some way to a header value? Here's what my code looks like

builder.Services.AddHttpClient("thoughtspot", client =>
            {
                client.BaseAddress = new Uri(thoughtspotConfig.InstanceUrl);
                client.DefaultRequestHeaders.Add("Accept", "application/json");
                client.DefaultRequestHeaders.Add("User-Agent", "payscale-httpclient");
            });
...
            _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", bearerToken);
            var json = {
  "branch_name": "pfload",
  "deploy_type": "FULL",
  "deploy_policy": "VALIDATE_ONLY"
};
            var response = await _httpClient.PostAsync("api/rest/2.0/vcs/git/commits/deploy", new StringContent(json, Encoding.UTF8, "application/json"));
            var content = await response.Content.ReadAsStringAsync();
            // here I get  the response is not successful 500 error

builder.Services.AddHttpClient("thoughtspot", client =>
            {
                client.BaseAddress = new Uri(thoughtspotConfig.InstanceUrl);
                client.DefaultRequestHeaders.Add("Accept", "application/json");
                client.DefaultRequestHeaders.Add("User-Agent", "payscale-httpclient");
            });
...
            _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", bearerToken);
            var json = {
  "branch_name": "pfload",
  "deploy_type": "FULL",
  "deploy_policy": "VALIDATE_ONLY"
};
            var response = await _httpClient.PostAsync("api/rest/2.0/vcs/git/commits/deploy", new StringContent(json, Encoding.UTF8, "application/json"));
            var content = await response.Content.ReadAsStringAsync();
            // here I get  the response is not successful 500 error

Any ideas what could be causing this different in behavior between user agents?

9 replies

Gaming

Programming