Tetsuya-san, > Happy to hear you again. I will meet you at next IETF.
Look forward to that! I'm sure I owe you a beer. > All commits were already completed on our different repository in GitHub. > There is no in progress commit and so I don’t think I can use the squash…. I > tried to do “git merge” from our repository to the “topic” branch based on > gerrit.fd.io/vpp.git repo. Even though adding the “Signed-off-by” statement > for 3 committers in the merge commit, I could not solve the issue… > > There are a lot of commits happened on our different repository (roughly > 100+) which was done by 3 contributors. I don’t think all commits happened on > our different repo were signed off…. > > I think only way is to retrieve the change happened on our different repo and > then apply it to the topic branch based on vpp.git repo. In this case, I can > create the flattened commit but all past commit log could be gone…. So, I am > asking if there is a way to make a flattened commit with keeping the past > commit log. I think the only working choice here is to squash and rebase all your changes into a single commit. Then keep 3 signed-off-by fields for the contributors. Then you will commit a review-able, buildable, testable plugin. The alternatives are pretty horrid. E.g. push 100+ individual commits, ensure verify builds, they review etc. Or bypassing review and pushing directly, would then leave us 100+ points in our history, where verify doesn't pass. Not that I'm a gerrit expert, but after some discussions and considerations from Ed, I think squash and rebase is your choice. Best regards, Ole
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14514): https://lists.fd.io/g/vpp-dev/message/14514 Mute This Topic: https://lists.fd.io/mt/40833844/21656 Group Owner: vpp-dev+ow...@lists.fd.io Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
