Skip to content
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.

Sign up for GitHub

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

Jump to bottom

readme is merge conflicted on checked - may be others? #318

Closed
hazendaz opened this issue Aug 19, 2023 · 6 comments · Fixed by #319
Closed

readme is merge conflicted on checked - may be others? #318

hazendaz opened this issue Aug 19, 2023 · 6 comments · Fixed by #319
Assignees
@laurentschoelens
Labels
bug documentation Adding or updating documentation duplicate
Milestone
2.0.5

Comments

@hazendaz
Copy link

noticed the readme had merge conflict resolution never performed so it shows as a merge conflict. Possibly there are others if readme got by that way.
@laurentschoelens
Copy link
Collaborator

@hazendaz thanks for the quick issue.
It was seen and I'll fix it next monday in cleaning PR

@laurentschoelens laurentschoelens added bug documentation Adding or updating documentation labels Aug 19, 2023
@laurentschoelens laurentschoelens added this to the 2.0.5 milestone Aug 19, 2023
@laurentschoelens
Copy link
Collaborator

I can also tell you that it's the only file concerned by merging flags "unresolved"

@laurentschoelens laurentschoelens self-assigned this Aug 19, 2023
@laurentschoelens
Copy link
Collaborator

Duplicate of #316

@laurentschoelens
Copy link
Collaborator

Change in progress

laurentschoelens added a commit to laurentschoelens/jaxb-tools that referenced this issue Aug 21, 2023
@laurentschoelens
Issues highsource#312 highsource#316 highsource#318
61fa5fb 
fixing build issues on annotate
remove .gitignore unnecessary files
fix root README.md
refactoring org.jvnet.annox to org.jvnet.jaxb.annox
upgrade / align dependencies
@laurentschoelens laurentschoelens mentioned this issue Aug 21, 2023
Merged
@laurentschoelens
Copy link
Collaborator

@hazendaz PR done #319

laurentschoelens added a commit to laurentschoelens/jaxb-tools that referenced this issue Aug 24, 2023
@laurentschoelens
Issues highsource#312 highsource#316 highsource#318
da21513 
fixing build issues on annotate
remove .gitignore unnecessary files
fix root README.md
refactoring org.jvnet.annox to org.jvnet.jaxb.annox
upgrade / align dependencies
laurentschoelens added a commit to laurentschoelens/jaxb-tools that referenced this issue Aug 24, 2023
@laurentschoelens
Issues highsource#312 highsource#316 highsource#318
bf137e9 
fixing build issues on annotate
remove .gitignore unnecessary files
fix root README.md
refactoring org.jvnet.annox to org.jvnet.jaxb.annox
upgrade / align dependencies
laurentschoelens added a commit to laurentschoelens/jaxb-tools that referenced this issue Aug 24, 2023
@laurentschoelens
Issues highsource#312 highsource#316 highsource#318
8dfd77b 
fixing build issues on annotate
remove .gitignore unnecessary files
fix root README.md
refactoring org.jvnet.annox to org.jvnet.jaxb.annox
upgrade / align dependencies
mattrpav added a commit that referenced this issue Aug 24, 2023
@mattrpav
Merge pull request #319 from laurentschoelens/jt-312-316
0856045 
Issues #312 #316 #318
@laurentschoelens
Copy link
Collaborator

@hazendaz readme is up to date
We also try to get all wiki doc and old confluence highsource in this repo wiki before moving to asciidoc documentation
Feel free to notice us if you found something wrong in the documentation again (or somewhere else).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@laurentschoelens laurentschoelens

Labels
bug documentation Adding or updating documentation duplicate
Projects
None yet
Milestone
2.0.5
Development

Successfully merging a pull request may close this issue.

Issues #312 #316 #318 laurentschoelens/jaxb-tools
2 participants
@hazendaz @laurentschoelens