Is it safe to have branches from team members checked out

[uloco]

It happened to me yesterday, that I had a branch a colleague was working on checked out locally. Not aware of this I ran git stack --pull and it rebased also the branch which does not belong to me.

What will happen if I git stack --push now?

Do I have to cleanup every branches of other people I occasionally checkout so I don't mess up their branches?

I assume --force-with-lease is used internally for git stack --push, but what if they haven't pushed anything yet but added commits locally?
Will git-stack --pull resolve the diverging histories for them? Or do they have to manually check out the remote branch (with a different name) and rebase their local changes here on top of it again?

What do you do in those scenarios?

[epage]

git-stack identifies and protects non-personal branches with the following caveats

• The branch contains a commit with you as the committer or author
• You've made a branch on top of the other user's branch
  • This seems like a bug, we should allow you to make branches on top of other people's work
• HEAD is on a commit on that branch

Overall, this was trying to have git-stack ignore other people's branches while allowing you to take over the branch and start doing work on it.

[uloco]

Thanks anyway!

[epage]

To be clear,. that isn't a "no" but a "this needs some things figured out".

I'd recommend opening an issue for further exploration of this.

[epage]

As for people's workflows, I've more so taken over people' s branches as an open source maintainer rather than someone working on a team as the expectations for contributors tends to be lower.

Even on a team, it happens from time to time whether due to collaborating, handing off work, etc.

[epage]

(I'll also add that I'm someone who never checks out other's people's work as part of the code review though I know there are people who do it for every review)

[uloco]

ok thanks for your in detail thoughts about this. will open an issue for this and we can discuss :)