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

Code must be pushed to remote after feature1 finished, before feature2 start? #27

Open
Just2Archi opened this issue Apr 22, 2018 · 2 comments
Labels

Comments

@Just2Archi
Copy link

image

  1. flow init -> OK
  2. start feature1 -> OK
  3. change source and some commits -> OK
  4. finish feature1 -> OK
  5. start feature2 -> Error: Branch "develop" has diverged from origin/develop
  6. push develop to remote -> OK
  7. start feature2 -> OK
@vector-of-bool
Copy link
Owner

If I understand correctly, this was the original behavior in the Gitflow shell-scripts. Also, finishing a feature branch should push the develop branch automatically. How quickly after finishing one feature branch do you start a new one?

@Ovsyanka
Copy link

Ovsyanka commented Feb 21, 2019

In case if local master is ahead of remote master in my opinion there should be different button "Push now". Right now this message and this button confuse the user because pulling doesn't solve the issue.

Btw, I just tested gitflow-avh in console and it creates the feature branch even with that warnings:

$ git flow feature start test2
Branches 'master' and 'origin/master' have diverged.
And local branch 'master' is ahead of 'origin/master'.
Switched to a new branch 'feature/test2'

Summary of actions:
- A new branch 'feature/test2' was created, based on 'master'
- You are now on branch 'feature/test2'

Now, start committing on your feature. When done, use:

     git flow feature finish test2

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

3 participants