Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update README to mention how to update an in-progress feature branch from origin/master #125

Closed
sethladd opened this issue Aug 5, 2015 · 4 comments
Labels

Comments

@sethladd
Copy link
Contributor

sethladd commented Aug 5, 2015

Assuming changes have come into origin/master while I've been working on my local feature branch. What's the git-fu that master reflowers use to update my local feature branch with the latest and greatest?

(apologies if I missed it in the README, I checked and couldn't find it)

I've been doing a standard:

(inside of my local feature branch)
git fetch origin
git merge origin/master

But I'm sure there's a better reflow-approved way.

Thanks!

@codenamev
Copy link
Collaborator

git pull origin master is what we use, which does the same thing you mentioned.

There is a feature request open (#74) we should be able to get to shortly to make this a reflow command. git reflow update maybe?

@sethladd
Copy link
Contributor Author

sethladd commented Aug 5, 2015

That would help. At minimum, some talk about the preferred workflow in the README will help, even if it's git pull origin master , which is pretty reasonable.

@sethladd sethladd changed the title Q: how to update an in-progress feature branch from origin/master ? Update README to mention how to update an in-progress feature branch from origin/master Aug 5, 2015
@codenamev codenamev added the TODO label Aug 8, 2015
@codenamev
Copy link
Collaborator

@codenamev
Copy link
Collaborator

Fixed in v0.8.0 with 3b44510. git reflow refresh 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants