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

Fixes always active menu route #299

Merged
merged 1 commit into from
Dec 10, 2023

Conversation

Smilinko
Copy link
Contributor

@Smilinko Smilinko commented Dec 9, 2023

closes #288

@Smilinko Smilinko linked an issue Dec 9, 2023 that may be closed by this pull request
Copy link
Member

@Matushl Matushl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moze byt

Copy link
Collaborator

@rtrembecky rtrembecky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

je tu ale konflikt a nejak sa tam dostali zmeny, co robil v tom subore Matus myslim.

treba:

# prepnut sa na mastra a pullnut ho - bud vo VSCode alebo takto:
git checkout master
git pull
# prepnut sa na tuto branch a rebasnut ju
git checkout 288-menu-vzdy-aktivne-podfarbena-routa-novinky
git rebase master
# ak to zakrici, ze je tam konflikt, vliezt do toho suboru a upravit ho tak, ako ma vysledne vyzerat (aby zahrnoval vsetky zmeny). da sa to vo VSCode source controle. potom treba
git rebase --continue
# az kym nevypise, ze successfully rebased on master. potom treba "force-pushnut" - nahradit cely upstream stav branche tvojim lokalnym stavom
git push --force

to by malo nahradit stav zmien v tejto branchi/PR a malo by prestat tu dole pisat, ze je tu konflikt

@Smilinko Smilinko force-pushed the 288-menu-vzdy-aktivne-podfarbena-routa-novinky branch from 525129c to c657558 Compare December 10, 2023 09:47
@Smilinko Smilinko force-pushed the 288-menu-vzdy-aktivne-podfarbena-routa-novinky branch from c657558 to 28bb925 Compare December 10, 2023 10:06
@Smilinko Smilinko merged commit 6bf6805 into master Dec 10, 2023
1 check passed
@Smilinko Smilinko deleted the 288-menu-vzdy-aktivne-podfarbena-routa-novinky branch December 10, 2023 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Menu - vzdy aktivne podfarbena routa Novinky
3 participants