JDK Sandbox and Skara
erik.helin at oracle.com
Wed Sep 9 10:18:09 UTC 2020
On 9/9/20 12:06 PM, Aleksey Shipilev wrote:
> Hi again,
> On 9/8/20 3:02 PM, Erik Helin wrote:
>> Yes, since you are a Committer (actually Reviewer, but the point here is
>> that you have Committer status) you have been given direct write access
>> to the openjdk/jdk-sandbox repository . Feel free to use the
>> openjdk/jdk-sandbox repository in the same way as you used the Mercurial
>> jdk/sandbox repository .
> Okay, then another clarification.
> When we need to update our jdk-sandbox branches to current state of
> master, we are just plainly "git merge" master to our branches, right?
> In other words, we do the same thing as we do with Mercurial here.
> We don't do any of "git rebase" magic, even for jdk-sandbox, because the
> jdk-sandbox branches are already public and it would make a mess for
> other contributors to the same branch? It probably makes some sense to
> say that rebase should not be used except within the personal forks?
If you are the sole person working on your personal branch in
jdk-sandbox, then feel free to rebase.
If there are multiple people collaborating (what I guess will be the
most common use-case for branches in jdk-sandbox) then you are correct,
then you should use merge in order to not mutate public history. I
should probably just "port" the old Mercurial sandbox documentation 
over to a new "Sandbox" page on the Skara wiki and in the process add a
note about this. I will get to that shortly, thanks for pointing this out!
More information about the skara-dev