samoa-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Gianmarco De Francisci Morales <>
Subject Re: [DISCUSS] Dev git setup
Date Wed, 28 Jan 2015 09:22:50 GMT

Just for me to be clear: GM, we’re talking rebasing locally but merge
> committing in the repo right? Like we have been doing before? At least,
> that’s how I read this right now. correct me if I’m wrong?

Yes, that's what I meant.
Rebase the master locally (never commit to the local master), fork, merge
commit back in the repo (possibly squashing all the commits on the branch
in a single one that represents the patch).


  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message