0

merged feature/fix to develop. My collegue after this merge make three commits to feature/fix.

How to apply these three commits on develop ?
I know cherry-pick, however I am searching for other solution. Thanks

Haskell Fun
  • 299
  • 4
  • 13
  • 2
    Just merge `feature/fix` into `develop` again. – kowsky Aug 02 '17 at 05:45
  • Or rebase, if for some reason you don't want a merge commit. – 1615903 Aug 02 '17 at 05:46
  • Possible duplicate of [Move the most recent commit(s) to a new branch with Git](https://stackoverflow.com/questions/1628563/move-the-most-recent-commits-to-a-new-branch-with-git) – 1615903 Aug 02 '17 at 05:46
  • Personally I would avoid merge at all costs, and go with `rebase`. `git pull --rebase `. in this case you can checkout develop, then integrate `feature/fix` using rebase. – Tr1gZer0 Aug 02 '17 at 05:47

1 Answers1

4

Switch to branch 'develop'

git checkout develop

merge commits of feature fix to develop:

git merge feature/fix

farazmateen
  • 157
  • 9