why not update code before finish action? #98

Activity

1. stuartherbert

   added

   more information requiredWaiting for the original poster to come back with further information.Waiting for the original poster to come back with further information.

   on Apr 16, 2018
2. stuartherbert commented on Apr 16, 2018

   

   stuartherbert

   on Apr 16, 2018

   More actions

   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.
3. teddy-hoo commented on Apr 17, 2018

   

   teddy-hoo

   on Apr 17, 2018

   Last edited by teddy-hoo

   Author

   More actions

   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 .
4. etienne-napoleone commented on Jul 6, 2018

   

   etienne-napoleone

   on Jul 6, 2018

   Last edited by etienne-napoleone

   More actions

   @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.