search

vector-of-bool / vscode-gitflow

Gitflow integration for Visual Studio Code
89 stars 22 forks source link

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

Open Just2Archi opened 6 years ago

Just2Archi commented 6 years ago

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 commented 6 years ago

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 commented 5 years ago

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