Hi Serban, Generally when you see such a warning you should not submit; this is how you get into the situation where your change depends on other changes in Gerrit, making it un-mergeable. It’s only ok to submit with those dependencies if you are sure that all those other dependencies will be submitted and merged first, which is typically hard to guarantee.
What you usually should do is to always make each change off of the latest master. So, typically this means: # make some changes, commit git review # this submits the change to gerrit git reset --hard origin # WARNING: this will blow away all your commits in the working directory! git pull # pull latest code This will get your local working directory back to match the latest master branch. Then you work on your next change on top of this. Thanks, Gary From: JORA, SERBAN (SERBAN) [mailto:[email protected]] Sent: Friday, September 15, 2017 1:52 PM To: Gary Wu <[email protected]> Subject: RE: [Modeling javatoscachecker] About the javatoscacheker.jar in the nexus. Thank you, Made the update. Trying to use ‘git review’ but I get the following jora@vm-jora:~/src/toscaparsers/javatoscachecker$ git review Enter passphrase for key '/home/jora/.ssh/id_rsa': You are about to submit multiple commits. This is expected if you are submitting a commit that is dependent on one or more in-review commits. Otherwise you should consider squashing your changes into one commit before submitting. The outstanding commits are: 133c26e (HEAD -> master) Correct the group id in poms a002ab7 Remove ecomp staging deployment plugin. 903c9b8 Reorganize poms, declare version as 1.0.0 0b72d5f Remove old test files (moving to junit) bcfbb7a Tune the license text 163c17b Add license header to kwalify d1c7688 Add common parent project ref to top level pom. Do you really want to submit the above commits? Is that normal? (only the top one is actually new but the rest have not been submitted through git-review) Should I proceed?
_______________________________________________ onap-discuss mailing list [email protected] https://lists.onap.org/mailman/listinfo/onap-discuss
