I need help in resolving merge conflict in git pull from GitHub, I did following
on my current branch, I did the following
git pull --rebase master
git pull ssh:.....(pulled changes from my review)
git add .
git commit --amendI got error
"fatal: you are in the middle of merge -- cannot amend"
I want to amend same commit again without createating new commit ID. is there a way ?
I want to amend same commit again without createating new commit ID ... you can't do that. Regading your immediate error, did you run git status after resolving the merge conflicts? If you saw a message which showed that there are still some conflicts present, then this would prevent you from committing.
While merging you don't create new commits aside from the merge commit. When git status shows all conflicts are fixed, you run git merge --continue
I see message "All conflicts fixed but you are stil merging " use git commit to conclude merge"
Thanks for Help Folks ,git merge --continue worked for me.
Note that git merge --continue simply runs git commit "under the hood". It's nice that the Git folks added this as an option in Git version 2.12.0. If your Git is older than that, though, you must use git commit instead.