merge from remote develop branch, and see changes in feature branch?

[stro...@gmail.com]

Hi folks.

We have develop branched from master, and I have feature/INF-824 branched from develop.

One of my coworkers has added a change to develop that's relevant to INF-824.

How can I merge his changes into my copy of develop, and see them in feature/INF-824?

Thanks!

[Ellis Antaya]

git flow feature rebase develop

1100101000111101

" Unfortunately, no one can be told what The Matrix is.  You have to see it for yourself. "

--
You received this message because you are subscribed to the Google Groups "gitflow-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to gitflow-user...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Ellis Antaya]

https://github.com/nvie/gitflow/wiki/Command-Line-Arguments#git-flow-feature-rebase--i-namenameprefix

1100101000111101

" Unfortunately, no one can be told what The Matrix is.  You have to see it for yourself. "

[stro...@gmail.com]

Thanks, but:

(dev) dstromberg@dstromberg-linux ~/PycharmProjects/infinity_PY $ git flow feature rebase develop

No branch matches prefix 'develop'

(dev) dstromberg@dstromberg-linux ~/PycharmProjects/infinity_PY $ git branch -a

  develop

* feature/INF-824

  master

  remotes/origin/HEAD -> origin/master

  remotes/origin/develop

  remotes/origin/feature/INF-830

  remotes/origin/master

  remotes/origin/master5

  remotes/origin/master6

(dev) dstromberg@dstromberg-linux ~/PycharmProjects/infinity_PY $ git flow feature rebase remotes/origin/develop

No branch matches prefix 'remotes/origin/develop'

What am I doing wrong?

Thanks!