Git flow work flow in Source Tree

Question

Hi all

I've only recently starting using Git and Git Flow in Source Tree, I have a simple question about actual work flow.

I'm working in a branch off the develop branch.

There are changes from a colleague I need to pull.

Is it best to move back to the develop branch and pull the changes without finishing my branch.

Or finish my branch don't push my chnages and then pull the colleagues changes

Or finish and push my branch and then pull the colleagues changes

Seth · Answer

@Johannes Kilian It wasn't your English that caused Chris to miss it. It was just obscured by the fact that you needed to address multiple situations that the vague question might have been referring to. Since Chris seemed to have missed it, I just repeated it by itself.

Johannes Kilian_pi36cl · Answer

That's exactly what I tried to say - but my English is not good enough to find such clear and precise words ;-) @Chris: Your branch is finished when it is finished - as Seth said: it should not be considered as finished only for pulling any others changes. Your last sentence "Or leave my branch switch to develop and pull the changes then switch back to my branch continue working and finish my branch when I'm done and merge it back into develop." is exactly the way to go. Generally said: if you want to incorporate other peoples published and pushed features, you switch to branch , pull the changes, switch back to your feature branch and merge the changes from . This works the better, the stricter the developers follow pure gitflow (i.e not merging back unfinished features to and so on)

Seth · Answer

The recommended actions (Johannes did include this in the original answer) would be to leave your branch, switch to develop and pull, then switch back to your branch. If you want, you can merge develop (which will include the other dev's changes) into your feature branch before continuing to work on it.

You should never "finish" a feature unless it is actually finished.