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.

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

[Backport 4868 to 2.10.x] [Fixes #4827] Line layer uploaded to GeoNode is rendered as point layer (#4868) #4875

Merged
merged 2 commits into from
Sep 12, 2019

Conversation

afabiani
Copy link
Member

Commits ["5dc3ef0a6478ead4ba5ce7ed0e6eb8f920514cfa","94574f42c0ccdc9a5334fc98419bb85a1166f14d"] could not be cherry-picked on top of 2.10.x
To backport manually, run these commands in your terminal:

Fetch latest updates from GitHub.

git fetch

Create new working tree.

git worktree add .worktrees/backport 2.10.x

Navigate to the new directory.

cd .worktrees/backport

Cherry-pick all the commits of this pull request and resolve the likely conflicts.

git cherry-pick 5dc3ef0 94574f4

Create a new branch with these backported commits.

git checkout -b backport-4868-to-2.10.x

Push it to GitHub.

git push --set-upstream origin backport-4868-to-2.10.x

Go back to the original working tree.

cd ../..

Delete the working tree.

git worktree remove .worktrees/backport
Then, create a pull request where the base branch is 2.10.x and the compare/head branch is backport-4868-to-2.10.x.

@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Sep 11, 2019
@afabiani afabiani merged commit 7908cff into 2.10.x Sep 12, 2019
@afabiani afabiani deleted the backport-4868-to-2.10.x branch September 12, 2019 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed CLA Bot: community license agreement signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants