trying to reflect changes on nationalmap instead #9
Conversation
This file contains 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
Pull in lockfile adr
Fix manifest path
…sium Update terriajs and terriajs-cesium versions
updating master to Pr/5
In the new version .prettierignore ignores css. This is causing a blank page if this line is not removed (I assume). # Unignore directories (to all depths) and unignore code and style files !lib/**/
start_url changed and no experimental features
# Conflicts: # lib/Styles/variables.scss # lib/Views/UserInterface.jsx # wwwroot/config.json # wwwroot/favicons/manifest.json # wwwroot/index.html
# Conflicts: # lib/Views/UserInterface.jsx # wwwroot/config.json # wwwroot/favicons/manifest.json
trying to revert to Before bing labels. Resolved conflicts:
Github does not do it but another tool can be used to have a track on GitHub. git which comes with (git-gui) automatically includes the conflicts in the merge commit. So it is recorded in the github.com in merge comments automatically. One can look in the history of each file individually it see the changes.
An example comment is like:
Precedes:
Merge branch 'upstream_master' into local_master
# Conflicts:
# lib/Styles/variables.scss
# lib/Views/UserInterface.jsx
# wwwroot/config.json
# wwwroot/favicons/manifest.json
# wwwroot/index.html
Revert "Before bing labels"
Signed-off-by: Zafer <[email protected]>
Signed-off-by: Zafer <[email protected]>
trying to pull from origin before merging bing labels changes
instead of 7.11.4 and 1.68
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.