Merge up to a specific commit

Question

I created a new branch named newbranch from the master branch in git. Now I have done some work and want to merge newbranch to m

Answer 1

Run below command into the current branch folder to merge from this to current branch, --no-commit do not make a new commit automatically

git merge --no-commit 

git merge --continue can only be run after the merge has resulted in conflicts.

git merge --abort Abort the current conflict resolution process, and try to reconstruct the pre-merge state.