JmeSurfaceView: Package migration#1808
Closed
pavly-gerges wants to merge 14 commits into
Closed
Conversation
Contributor
Author
|
Hmm, didn't expect these files to cause conflicts between the 2 branches....i guess nothing can resolve this, i need to copy my files to another new branch with new PR, because if i merged the 2 branches on top of one another, all the work would disappear. |
* JmeSurfaceView: format fix and java-docs improves * JmeSurfaceView: format fix and java-docs improves * Code: removed import statements white spaces
…e/jmonkeyengine into package-migration
Contributor
Author
|
I tried to resolve the conflicts but i cannot, i will just close this and open a new clean one with the same changes (just copying files to another branch), i had to study later why this conflict happens even though i have refractored moved the classes to a new package at the top of this branch. |
Contributor
Author
|
Ah i got it, i was sub-branching without updating the traffic automatically using |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR includes :
com.jme3.view.surfaceviewpackage.package-info.javafor the new packages.This PR targets :
Note : this branch is a sub-branch of
javadocs-format-improves, so it pre-resolves the conflicts after merging the docs improvements PR 👍 .