Skip to content
This repository was archived by the owner on May 10, 2022. It is now read-only.

updating readme and adding additional development details #31#33

Merged
bfitzpat merged 1 commit intocamel-tooling:masterfrom
bfitzpat:issue32-update-readme
Dec 6, 2018
Merged

updating readme and adding additional development details #31#33
bfitzpat merged 1 commit intocamel-tooling:masterfrom
bfitzpat:issue32-update-readme

Conversation

@bfitzpat
Copy link
Copy Markdown
Contributor

@bfitzpat bfitzpat commented Nov 15, 2018

Signed-off-by: Brian Fitzpatrick bfitzpat@redhat.com

@bfitzpat
Copy link
Copy Markdown
Contributor Author

bfitzpat commented Nov 15, 2018

I'm unsure why there are conflicts, but the files have been updated.

@bfitzpat
Copy link
Copy Markdown
Contributor Author

bfitzpat commented Nov 15, 2018 •
edited
Loading

Also - tried doing an interactive rebase to change the git message to refer to #32 instead of #31 but I keep seeing "noop" in the command line when I give that a go.

@bfitzpat bfitzpat mentioned this pull request Nov 15, 2018
Closed
@apupier
Copy link
Copy Markdown
Member

apupier commented Nov 16, 2018 •
edited
Loading

I think there are conflicts because this branch is based on your remote master branch but not on the Camel Tooling master branch.
You need to rebase on Camel tooling master branch. You will have a conflict to resolve. Then commit with the resolved conflict and finally force push.

Also - tried doing an interactive rebase to change the git message to refer to #32 instead of #31 but I keep seeing "noop" in the command line when I give that a go.

can you precise on which commit you called the interactive rebase?
have you tried using Egit interface, with right-click on the commit, then Modify -> reword ?

ping me if you need help to do it, especially if my assumptions were wrong :-)

@apupier apupier mentioned this pull request Nov 16, 2018
Merged
@bfitzpat bfitzpat force-pushed the issue32-update-readme branch from e395ae6 to d70bb28 Compare November 16, 2018 13:58
@bfitzpat
Copy link
Copy Markdown
Contributor Author

bfitzpat commented Nov 16, 2018

Rebasing on upstream master did the trick. Thanks.

@bfitzpat
Copy link
Copy Markdown
Contributor Author

bfitzpat commented Nov 16, 2018

Once we get #31 finished up, we can get this one merged too.

@bfitzpat
updating readme and adding additional development details camel-tooli…
75d6869 
…ng#31

-- adding wsdl2rest details and known issues

Signed-off-by: Brian Fitzpatrick <bfitzpat@redhat.com>
@bfitzpat bfitzpat force-pushed the issue32-update-readme branch from d70bb28 to 75d6869 Compare December 5, 2018 15:40
@bfitzpat
Copy link
Copy Markdown
Contributor Author

bfitzpat commented Dec 5, 2018

Updated readme with new wsdl2rest details and list of known issues

@bfitzpat bfitzpat requested review from apupier and lhein December 5, 2018 15:41
This was referenced Dec 5, 2018
Merged
Closed
@bfitzpat bfitzpat merged commit 4786d2a into camel-tooling:master Dec 6, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lhein lhein Awaiting requested review from lhein

1 more reviewer

@apupier apupier apupier approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

READY FOR REVIEW

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@bfitzpat @apupier