search

smartFreshBear / RecipeGrabber

Apache License 2.0
1 stars 2 forks source link

Yotam playg 37 support insert fix #103

Closed yotam-yakovw closed 1 year ago

yotam-yakovw commented 1 year ago

New and improved branch for my ticket Commits went down to 2 and only relevant files are commited

yotam-yakovw commented 1 year ago

GIT IS HARD! so I fixed the typo and commited the changes, then squashed the commit to the previous so it won't show but to push I was forced to merge the remote branch(?) Now there is a copy of the last commit and another merge commit? what is going on and what am I doing wrong??

smartFreshBear commented 1 year ago

yes because!!! you merged instead rebase right? like I said many times in Playground we don't merge... but no worries. you can keep the merge commit. but the rest you have to squash together

yotam-yakovw commented 1 year ago

But it didn't let me push without merging I'm so confused Was I supposed to pull and then push? Wouldn't it change things back again?

yotam-yakovw commented 1 year ago

So I looked it up online, apparently because the commits were already in the remote branch I need to force push to change commits and that let me get pass the merge requirement. somehow the merge commit disappeared so that's a plus I guess :D

yotam-yakovw commented 1 year ago

After logging branch revert rebased on master, fixed conflicts and tested the app Force pushed changes and hopefully ready to merge