Problem is that "git review" noticed I made several commits and asks:
maastest@xenial-juju:~/Users/fulvio/localcharms/charm-keystone$ git review
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.
Hallo James,
sorry for being so ignorant with Git... I'd like to commit my changes
for review.
Here is the current status:
maastest@ xenial- juju:~/ Users/fulvio/ localcharms/ charm-keystone$ git status
On branch bug/1671506
nothing to commit, working directory clean
maastest@ xenial- juju:~/ Users/fulvio/ localcharms/ charm-keystone$ git superlog da6d4f2a29fffc6 f4d6cc2261 (HEAD -> bug/1671506) Merge 9cf97f552e94651 f873d3abb2 (master) Merge 00bccab360bc161 5c74150c94 (origin/master, origin/HEAD, 3ea8343848a8e17 f44736e79b Updated icon 7368b3c7e09bdc1 9649b7ac46 Updates for pike b1 d5e6a6d176c0c12 a2cb263358 Network space aware address aeacf74492bcac6 575c0292ab Merge "Enable Zesty-Ocata
* 1b908ee82b8cc3a
remote-tracking branch 'origin/master' into bug/1671506
|\
| | * 3d84a3563ab8016
remote-tracking branch 'origin/master'
| | |\
| |/ /
|/| /
| |/
| * 681047f39777c57
gerrit/master) Use 'uuid' token provide configuration
| * 6f99e78cdeebfe9
| * d36af554846fcd3
| * d62a2e75c3efb52
for cluster relation
| * 8b066b7eabf24f4
Amulet Tests"
......
Problem is that "git review" noticed I made several commits and asks:
maastest@ xenial- juju:~/ Users/fulvio/ localcharms/ charm-keystone$ git review
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:
1b908ee (HEAD -> bug/1671506) Merge remote-tracking branch 'origin/master'
into bug/1671506
a67fd8c Related-Bug: 1671506
5b7797c Updated icon
e135c85 Updates for pike b1
......
Can you please suggest how should I move on from here? I am not familiar
with rebasing...
Thanks!
Fulvio