-
Notifications
You must be signed in to change notification settings - Fork 58
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update GUIController.java #33
Conversation
For the CoAP server I am connecting to, it returns a hierarchy. And this tool was not including the slashes between path elements, and returning extra errors while browsing the tree. This patch corrects both errors.
Signed the eclipse contribution agreement. |
Hi @YonasJ first thanks for your contribution!
You must use the e-mail you used for the ECA (yonas.jongkind@gmail.com). |
cf-browser/src/main/java/org/eclipse/californium/tools/GUIController.java
Show resolved
Hide resolved
I possible, please add the |
Signed-off-by: Yonas Jongkind <yonas.jongkind@gmail.com>
Still thanks! To pass the ip-validation, please "squash" your 3 commits into 1 commit and ensure, that that one is signed (as you already did for a6699a1). Then just push that commit "forced" to your branch. |
For the CoAP server I am connecting to, it returns a hierarchy. And this tool was not including the slashes between path elements, and returning extra errors while browsing the tree. This patch corrects both errors.
I can't figure out how to do the squash. According to this documentation: It seems like there should be an option to squash, but I don't see that menu. I tried to merge them in the client, but that just seemed to create more commits. Any documentation about how to do the squash? |
Signed-off-by: Yonas Jongkind <yonas.jongkind@gmail.com> Add {} per code review request. Update GUIController.java For the CoAP server I am connecting to, it returns a hierarchy. And this tool was not including the slashes between path elements, and returning extra errors while browsing the tree. This patch corrects both errors.
Do you use the eclipse IDE? If so, http://www.vogella.com/tutorials/EclipseGit/article.html contains a lot of useful information. In So, now, after the merge, the 1. thing to do, please "reset --hard" your branch to the commit a6699a1 . Alternatively: If this doesn't work, and you agree, that I push it to the master branch, I can do this as well :-). |
Thanks for all that information. I made the changes in my eclipse copy of the master repository. However, it's on the trunk and not my own branch. I made the fix by making the same edit in the "Github" change file UI in the web. If I had it checked out with Tortoise as i normally do, I think I could squash it. But I can't figure it out for the web version. If you could accept this patch in this format, that would be great. And next time I will create my own branch and commit the normal way from Eclipse so squashing is easily possible. |
Thanks! |
Just to mention: |
Yeah, I started with this version as I am using eclipse smarthome, that
uses this older version. I am also working on a patch for that one to
update to a newer version.
Y.
…------------------------------
*Yonas Jongkind*
Office: (778) 898-9951
Mobile: (778) 268-1432
Skype: yonas.jongkind
*In today’s materialistic world there is a risk of people becoming slaves
to money, as though they were simply cogs in a huge money-making machine.
This does nothing for human dignity, freedom, and genuine well-being.
Wealth should serve humanity, and not the other way around. - Dalai Lama
(Tibet)*
*Life is good!*
On Thu, Jan 31, 2019 at 11:22 AM Achim Kraus ***@***.***> wrote:
Just to mention:
In the meantime, we spend to most time in improving the 2.0.x branch.
May be you consider to use that as well. I pushed your changes also to
that branch.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#33 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AMNodY5paaDyTa8nK1sXjK0xjtJR-WMPks5vI0KOgaJpZM4aXEO9>
.
|
OK, so 1.0.x will be the right one :-). |
For the CoAP server I am connecting to, it returns a hierarchy. And this tool was not including the slashes between path elements, and returning extra errors while browsing the tree. This patch corrects both errors.