Git merge hotfix branch into feature branch

How do we merge the master branch into the feature branch? Easy:

git checkout feature1
git merge master

There is no point in forcing a fast forward merge here, as it cannot be done. You committed both into the feature branch and the master branch. Fast forward is impossible now.

Have a look at GitFlow. It is a branching model for git that can be followed, and you unconsciously already did. It also is an extension to Git which adds some commands for the new workflow steps that do things automatically which you would otherwise need to do manually.

So what did you do right in your workflow? You have two branches to work with, your feature1 branch is basically the “develop” branch in the GitFlow model.

You created a hotfix branch from master and merged it back. And now you are stuck.

The GitFlow model asks you to merge the hotfix also to the development branch, which is “feature1” in your case.

So the real answer would be:

git checkout feature1
git merge --no-ff hotfix1

This adds all the changes that were made inside the hotfix to the feature branch, but only those changes. They might conflict with other development changes in the branch, but they will not conflict with the master branch should you merge the feature branch back to master eventually.

Be very careful with rebasing. Only rebase if the changes you did stayed local to your repository, e.g. you did not push any branches to some other repository. Rebasing is a great tool for you to arrange your local commits into a useful order before pushing it out into the world, but rebasing afterwards will mess up things for the git beginners like you.

Related Posts:

  1. What is the best (and safest) way to merge a Git branch into master?
  2. Create a branch in Git from another branch
  3. How to keep a branch synchronized/updated with master?
  4. How do I delete a Git branch locally and remotely?
  5. How do I delete a Git branch locally and remotely?
  6. How do I rename a local Git branch?
  7. Undo a Git merge that hasn’t been pushed yet
  8. How to remove local (untracked) files from the current Git working tree
  9. Abort a Git Merge
  10. Git fetch remote branch
  11. How do I clone a specific Git branch? [duplicate]
  12. Git fetch remote branch
  13. How do I push a new local branch to a remote Git repository and track it too?
  14. How do I push a new local branch to a remote Git repository and track it too?
  15. How do I push a new local branch to a remote Git repository and track it too?
  16. How to resolve merge conflicts in a Git repository
  17. How can I merge multiple commits onto another branch as a single squashed commit?
  18. How to get just one file from another branch?
  19. How can I merge multiple commits onto another branch as a single squashed commit?
  20. Update Git branches from master
  21. How do I rename both a Git local and remote branch name?
  22. Create Git branch with current changes
  23. The following untracked working tree files would be overwritten by merge, but I don’t care
  24. The following untracked working tree files would be overwritten by merge, but I don’t care
  25. How to get the current branch name in Git?
  26. How do you create a remote Git branch?
  27. Move the most recent commit(s) to a new branch with Git
  28. Move the most recent commit(s) to a new branch with Git
  29. Make an existing Git branch track a remote branch?
  30. How do I call git diff on the same file between 2 different local branches?
  31. How to get the current branch name in Git?
  32. How do you create a remote Git branch?
  33. Git error on commit after merge – fatal: cannot do a partial commit during a merge
  34. Is there a “theirs” version of “git merge -s ours”?
  35. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  36. Branch from a previous commit using Git
  37. The following untracked working tree files would be overwritten by merge, but I don’t care
  38. Not a valid object name: ‘master’
  39. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  40. Is there a “theirs” version of “git merge -s ours”?
  41. How do I copy a version of a single file from one Git branch to another?
  42. Move existing, uncommitted work to a new branch in Git
  43. Delete branches in Bitbucket
  44. How do I push a local Git branch to master branch in the remote?
  45. Is it possible to pull just one file in Git?
  46. How to resolve git status “Unmerged paths:”?
  47. Resolve Git merge conflicts in favor of their changes during a pull
  48. Found a swap file by the name
  49. Is there a git-merge –dry-run option?
  50. Git pull – Please move or remove them before you can merge
  51. How do I run git log to see changes only for a specific branch?
  52. How to create a local branch from an existing remote branch?
  53. How can I delete all Git branches which have been merged?
  54. How to find which git branch I am on when my disk is mounted on other server
  55. How to create a new branch from a tag?
  56. How to use Git Revert
  57. How do I properly force a Git push?
  58. Git submodule update
  59. How to apply a patch generated with git format-patch?
  60. What does ‘git merge –abort is equivalent to git reset –merge when MERGE_HEAD is present.’ of Git merge man page mean?
  61. Git : fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists
  62. Remove files from Git commit
  63. How to solve SSL certificate: self signed certificate when cloning repo from github?
  64. How do I revert a Git repository to a previous commit?
  65. How to revert multiple git commits?
  66. How do I fix a Git detached head?
  67. What is HEAD in Git?
  68. Why does git say “Pull is not possible because you have unmerged files”?
  69. How can I git stash a specific file?
  70. What does “Git push non-fast-forward updates were rejected” mean?
  71. How do I diff the same file between two different commits on the same branch?
  72. You have not concluded your merge (MERGE_HEAD exists)
  73. Meaning of the GitHub message: push declined due to email privacy restrictions
  74. Is there a command to undo git init?
  75. Download a single folder or directory from a GitHub repo
  76. Is there a “git touch” so I can push the same file with a new timestamp?
  77. Hard reset of a single file
  78. git add remote branch
  79. Undo a git stash
  80. Undo git stash pop that results in merge conflict
  81. How to clone all remote branches in Git
  82. Set up git to pull and push all branches
  83. Invalid VCS root mapping – 3 errors on my project
  84. Unity Collaborate vs GitHub
  85. SourceTree keeps asking for Github password
  86. How to change the license for a project at Github?
  87. Git add all files modified, deleted, and untracked?
  88. How to switch back to ‘master’ with git?
  89. Github Authentication Failed – … GitHub does not provide shell access
  90. How do I pull files from remote without overwriting local files?
  91. Your repository has no remotes configured to push to
  92. Specify an SSH key for git push for a given domain
  93. How do I “un-revert” a reverted Git commit?
  94. git push not send changes to remote git repository
  95. How to merge a specific commit in Git
  96. How to use Git and Dropbox together?
  97. Git: Where exactly is the “working directory”?
  98. What exactly does the “u” do? “git push -u origin master” vs “git push origin master”
  99. Add latest commit info on login footer using login_footer hook
  100. Display GitLab repositories of the logged in user on a page

Leave a Comment