How to collaborate on one git commit in Gerrit?

up vote
0
down vote

favorite

How can one commit be worked on by multiple people in Gerrit? There are really two scenarios in mind.

Scenario A - simple collaboration

Developer A creates and pushes the commit to Gerrit on the master branch.

Developer B checks out the change following Gerrit's instructions, resulting in a detached head, but with Developer A's changes.

Developer B makes some changes.

What does Developer B do now in order to make their changes in the detached head amended to Developer A's commit in the master branch?

Scenario B -- complex collaboration

Developer A creates and pushes the commit to Gerrit on the master branch.

Developer B checks out the change following Gerrit's instructions, resulting in a detached head, but with Developer A's changes.

Developer B branches from this detached head twice (Fork Y and Fork Z), to make multiple WIPs.

Developer B works on Fork Y until it's ready to be merged with Developer A's single commit in master.

How does Developer B get their Fork Y work into the single commit on master?

asked Nov 19 at 16:57

Miles

95811137

add a comment |

up vote
0
down vote

favorite

How can one commit be worked on by multiple people in Gerrit? There are really two scenarios in mind.

Scenario A - simple collaboration

Developer A creates and pushes the commit to Gerrit on the master branch.

Developer B checks out the change following Gerrit's instructions, resulting in a detached head, but with Developer A's changes.

Developer B makes some changes.

What does Developer B do now in order to make their changes in the detached head amended to Developer A's commit in the master branch?

Scenario B -- complex collaboration

Developer A creates and pushes the commit to Gerrit on the master branch.

Developer B checks out the change following Gerrit's instructions, resulting in a detached head, but with Developer A's changes.

Developer B branches from this detached head twice (Fork Y and Fork Z), to make multiple WIPs.

Developer B works on Fork Y until it's ready to be merged with Developer A's single commit in master.

How does Developer B get their Fork Y work into the single commit on master?

asked Nov 19 at 16:57

Miles

95811137

add a comment |

up vote
0
down vote

favorite

How can one commit be worked on by multiple people in Gerrit? There are really two scenarios in mind.

Scenario A - simple collaboration

Developer A creates and pushes the commit to Gerrit on the master branch.

Developer B checks out the change following Gerrit's instructions, resulting in a detached head, but with Developer A's changes.

Developer B makes some changes.

What does Developer B do now in order to make their changes in the detached head amended to Developer A's commit in the master branch?

Scenario B -- complex collaboration

Developer A creates and pushes the commit to Gerrit on the master branch.

Developer B checks out the change following Gerrit's instructions, resulting in a detached head, but with Developer A's changes.

Developer B branches from this detached head twice (Fork Y and Fork Z), to make multiple WIPs.

Developer B works on Fork Y until it's ready to be merged with Developer A's single commit in master.

How does Developer B get their Fork Y work into the single commit on master?

asked Nov 19 at 16:57

Miles

95811137

How can one commit be worked on by multiple people in Gerrit? There are really two scenarios in mind.

Scenario A - simple collaboration

Developer A creates and pushes the commit to Gerrit on the master branch.

Developer B checks out the change following Gerrit's instructions, resulting in a detached head, but with Developer A's changes.

Developer B makes some changes.

What does Developer B do now in order to make their changes in the detached head amended to Developer A's commit in the master branch?

Scenario B -- complex collaboration

Developer A creates and pushes the commit to Gerrit on the master branch.

Developer B checks out the change following Gerrit's instructions, resulting in a detached head, but with Developer A's changes.

Developer B branches from this detached head twice (Fork Y and Fork Z), to make multiple WIPs.

Developer B works on Fork Y until it's ready to be merged with Developer A's single commit in master.

How does Developer B get their Fork Y work into the single commit on master?

git gerrit

asked Nov 19 at 16:57

Miles

95811137

asked Nov 19 at 16:57

Miles

95811137

asked Nov 19 at 16:57

Miles

95811137

asked Nov 19 at 16:57

Miles

95811137

asked Nov 19 at 16:57

Miles

95811137

add a comment |

1 Answer
1

active

oldest

votes

up vote
0
down vote

I believe I have a solution that works:

[pull patchset from Gerritt]

Git checkout -b foo

[make & commit changes to foo branch]

Git checkout master

git merge —squash —allow-unrelated-histories foo

[fix any merge conflicts]

Git commit —amend

Git branch -D foo

answered Nov 19 at 18:34

Miles

95811137

add a comment |

Your Answer

StackExchange.ifUsing("editor", function () {
StackExchange.using("externalEditor", function () {
StackExchange.using("snippets", function () {
StackExchange.snippets.init();
});
});
}, "code-snippets");

StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "1"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);

StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});

function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});

}
});

draft saved

draft discarded

Sign up or log in

StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});

Post as a guest

Name

Required, but never shown

StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53379361%2fhow-to-collaborate-on-one-git-commit-in-gerrit%23new-answer', 'question_page');
}
);

Post as a guest

Name

Required, but never shown

1 Answer
1

active

oldest

votes

1 Answer
1

active

oldest

votes

up vote
0
down vote

I believe I have a solution that works:

[pull patchset from Gerritt]

Git checkout -b foo

[make & commit changes to foo branch]

Git checkout master

git merge —squash —allow-unrelated-histories foo

[fix any merge conflicts]

Git commit —amend

Git branch -D foo

answered Nov 19 at 18:34

Miles

95811137

add a comment |

up vote
0
down vote

I believe I have a solution that works:

[pull patchset from Gerritt]

Git checkout -b foo

[make & commit changes to foo branch]

Git checkout master

git merge —squash —allow-unrelated-histories foo

[fix any merge conflicts]

Git commit —amend

Git branch -D foo

answered Nov 19 at 18:34

Miles

95811137

add a comment |

up vote
0
down vote

I believe I have a solution that works:

[pull patchset from Gerritt]

Git checkout -b foo

[make & commit changes to foo branch]

Git checkout master

git merge —squash —allow-unrelated-histories foo

[fix any merge conflicts]

Git commit —amend

Git branch -D foo

answered Nov 19 at 18:34

Miles

95811137

I believe I have a solution that works:

[pull patchset from Gerritt]

Git checkout -b foo

[make & commit changes to foo branch]

Git checkout master

git merge —squash —allow-unrelated-histories foo

[fix any merge conflicts]

Git commit —amend

Git branch -D foo

answered Nov 19 at 18:34

Miles

95811137

answered Nov 19 at 18:34

Miles

95811137

answered Nov 19 at 18:34

Miles

95811137

answered Nov 19 at 18:34

Miles

95811137

add a comment |

draft saved

draft discarded

draft saved

draft discarded

Sign up or log in

StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});

Post as a guest

Name

Required, but never shown

Post as a guest

Name

Required, but never shown

Sign up or log in

StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});

Post as a guest

Name

Required, but never shown

Sign up or log in

StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});

Post as a guest

Name

Required, but never shown

Sign up or log in

StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});

Post as a guest

Name

Required, but never shown

Name

Required, but never shown

Name

Required, but never shown

This page is only for reference, If you need detailed information, please check here

搜尋此網誌

Tukukkk