search

dboehmer / coocook

👨‍🍳🦉 Web application for collecting recipes and making food plans
https://coocook.org/
Other
11 stars 2 forks source link

Update marked.js #177

Closed tjfoerster closed 2 years ago

tjfoerster commented 2 years ago

176 finished

dboehmer commented 2 years ago

Looks good +1 Git says there are conflicts. Can you rebase on master after #175 was merged?

Ready for rebase :rocket:

dboehmer commented 2 years ago

Doesn’t look quite like I expected :smile: You see how your branch duplicates commits from master but diverges earlier on?

image

Don’t know how you created this but you’ll need to git fetch && git rebase -i origin/master and keep only the two commits that I marked with green. You probably meant to squash them together to 1 commit because you used the exact same commit message.

tjfoerster commented 2 years ago

git rebase -i origin/master was exactly what I did. Mhh. 🤔 Maybe it was too late... ⌚ 😄

tjfoerster commented 2 years ago

I hope this looks more like what you expected. :wink: