mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-11-03 18:53:17 -05:00
284df44209
* pin editor buttons on scroll * scaler scratch * fix langauge assignment 1st pass * set lang on navigate * refactor/breakup router * unify style for language selectro * refactor/code-cleanup * refactor/page specific components to page folder * Fix time card layout issue * fix timecard display * update mobile cards / fix overflow errors Co-authored-by: hay-kot <hay-kot@pm.me>
11 lines
283 B
Bash
11 lines
283 B
Bash
git checkout dev
|
|
git merge --strategy=ours master # keep the content of this branch, but record a merge
|
|
git checkout master
|
|
git merge dev # fast-forward master up to the merge
|
|
|
|
|
|
## TODOs
|
|
|
|
# Create New Branch v0.x.x
|
|
# Push Branch Version to Github
|
|
# Create Pull Request |