Skip to content
This repository has been archived by the owner on Nov 28, 2023. It is now read-only.

why not update code before finish action? #98

Open
teddy-hoo opened this issue Apr 16, 2018 · 3 comments
Open

why not update code before finish action? #98

teddy-hoo opened this issue Apr 16, 2018 · 3 comments
Labels
more information required Waiting for the original poster to come back with further information.

Comments

@teddy-hoo
Copy link

I begin a release usinggit hf release start 2.4
and someone else in my team merged his change to release/2.4 using github pull request.
I finish this release on local without executing a git hf update

Finally, my teammates' change is lost!

It is harmful!

@stuartherbert stuartherbert added the more information required Waiting for the original poster to come back with further information. label Apr 16, 2018
@stuartherbert
Copy link
Collaborator

I'm not sure how that could have happened.

According to the code Hubflow does a pull from origin at the start of a git hf release finish command. It then immediately pushes local back up to origin.

If anyone has a way to reproduce this problem, I'll happily dig into it further.

@teddy-hoo
Copy link
Author

teddy-hoo commented Apr 17, 2018

Hi, I can reproduce it stably.

# instance 1
git hf hotfix start 2.9.11
#instance 2
git pull
git checkout hotfix/2.9.11
# make some change
git commit -m 'test gitflow'
git push
#instance 1
git hf hotfix finish 2.9.11

with above operations, i can not get commit 'test gitflow' on instance 1.

and i see code here, it just fetch but no merge, and then merge using local branch code here .

@etienne-napoleone
Copy link

etienne-napoleone commented Jul 6, 2018

@teddy-hoo Why are you using :

  • git pull instead of git hf pull
  • git checkout instead of git hf checkout
  • git push instead of git hf push

Is it a typo in your post? If not, there's your problem.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
more information required Waiting for the original poster to come back with further information.
Projects
None yet
Development

No branches or pull requests

3 participants