Re: [GNUnet-developers] Updating my git work-in-progess branch?

[ng0]

Hartmut Goebel transcribed 1.3K bytes:
> 
> Am 15.03.19 um 09:19 schrieb Christian Grothoff:
> > Force pushes are never allowed, you must always rebase.
> 
> Rebase also requiers a force push since the branch is not continuing the
> prior history.

I think we never established a branch based workflow.
Given that we intend to make active use of branching
in the near future I think we should document the
ideal contribution and review process.

Personally I just merge master into branches if I work in
one, or pull with merge (not rebase) when I work on master.
 
> I'm used to provide a series of patches for review, fix and clean up,
> them merge or rebase. So for review I need to use an external repo, e.g.
> at gitlab.digitalcourage.de. Not much of a problem for me, but this
> hinders the reviewers workflow.
> 
> 
> > AFAIK only admins can delete branches that have been pushed to the server.
> 
> So after merging a branch I need to ask an admins to remove the old
> branch? Is this a Arbeitsbeschaffungsmaßname?

It's why we have people who can commit and people who can do
potentially destructive measurements on the server side.
Not everyone has the same access rights in gitolite.
And not everyone of the admins can delete. There's a special
@delete-admin or what I named it group which only becomes
active temporarily.
Our default is to never delete branches.
 
> -- 
> Regards
> Hartmut Goebel
> 
> | Hartmut Goebel          | address@hidden               |
> | www.crazy-compilers.com | compilers which you thought are impossible |
> 
> 
> _______________________________________________
> GNUnet-developers mailing list
> address@hidden
> https://lists.gnu.org/mailman/listinfo/gnunet-developers