Rebasing in smartgit "git-am is in progress"

I will try to explain the problem that I have. I have used the rebase option via git bash many times. Now I have SmartGit and don’t know why rebase is not correct.

Step 1:

Step 2:

Step 3:

The result is that HEAD detaches.

Answers


The same issue i have faced, i will delete the local branch in my machine and recreate it from origin each and every time. But finally i got the solution. I ran the below command

git am --abort solved my problem.


The only thing that I could do to cancel out the rebase after getting this error message was to delete the .git\rebase-apply folder and all of its contents.

rm .\.git\rebase-apply

Need Your Help

Static outgoing IP in Kubernetes

amazon-web-services kubernetes google-cloud-platform amazon-rds google-kubernetes-engine

I run a k8s cluster in google cloud (GKE) and a MySQL server in aws (RDS). Pods need to connect to RDS which only allows connections from certain IP. How can I configure outgoing traffic to have a ...

FragmentManager from Context

android

I created a new View class. Within that class I need to get access to the FragmentManager, but I cannot figure out how.