I'm about the last person to ask about git, as it's still black magic to me, but
$ git pull --rebase origin develop is what I use all the time after checking out a branch. This has the effect of pulling in the latest develop branch, and replaying your changes on top of it. dg > On Jan 24, 2017, at 11:23 AM, Sterling Hughes > <[email protected]> wrote: > > > $ git checkout <my-branch> > $ git pull origin develop -- David G. Simmons (919) 534-5099 Web <https://davidgs.com/> • Blog <https://davidgs.com/davidgs_blog> • Linkedin <http://linkedin.com/in/davidgsimmons> • Twitter <http://twitter.com/TechEvangelist1> • GitHub <http://github.com/davidgs> /** Message digitally signed for security and authenticity. * If you cannot read the PGP.sig attachment, please go to * http://www.gnupg.com/ <http://www.gnupg.com/> Secure your email!!! * Public key available at keyserver.pgp.com <http://keyserver.pgp.com/> **/ ♺ This email uses 100% recycled electrons. Don't blow it by printing! There are only 2 hard things in computer science: Cache invalidation, naming things, and off-by-one errors.
signature.asc
Description: Message signed with OpenPGP
