Jirong Hu
Reputation: 2375
How to merge this release branch to the master?
I was using this project to test all types of delete operation and ended up in the current situation. Now when I try to merge from release to master, it always give me "Git apply failed with code 1: checking patch error does not exist in index" error when I try to stage the hunk.
What shall I do at this point?
Upvotes: 0
Views: 90
Answers (1)
Vampire
Reputation: 38734
Your branches master and release are not connected, so you cannot merge. But if the image is not misleading and the two commits on master are effectively the same commits as the first two commits on your release branch, then just reset your master branch to your release branch by doing git branch -f master release.
Upvotes: 2
Related Questions
- How do I push a new local branch to a remote Git repository and track it too?
- How to check out a remote Git branch?
- How can I rename a local Git branch?
- How do I undo the most recent local commits in Git?
- How do I get the current branch name in Git?
- How do I delete a Git branch locally and remotely?
- How do I safely merge a Git branch into master?
- How do I remove local (untracked) files from the current Git working tree?
- Move the most recent commit(s) to a new branch with Git
- How do I resolve merge conflicts in a Git repository?