search

redhat-developer / vscode-paver

Use IBM Granite LLM as your Code Assistant in Visual Studio Code
Apache License 2.0
6 stars 13 forks source link

added display instructions on how to re-open the wizard #107

Closed lavanyaj3 closed 3 weeks ago

lavanyaj3 commented 1 month ago

added display instructions on how to re-open the wizard

fbricon commented 1 month ago

No the changes belong to app.tsx, with styles going into app.css

fbricon commented 1 month ago

please rebase your branch against main

lavanyaj3 commented 4 weeks ago

@fbricon done rebase. Its already up to date

fbricon commented 4 weeks ago

no it's not rebased

Screenshot 2024-10-28 at 10 28 42 Screenshot 2024-10-28 at 10 28 19

basically, you should never, ever use "git merge" on this project.

lavanyaj3 commented 4 weeks ago

i rebased again. Can you please check now.

fbricon commented 4 weeks ago

"git rebase main" still fails

lavanyaj3 commented 4 weeks ago
image

I followed the commands and not finding anything to rebase Please correct me if I missed anything

fbricon commented 4 weeks ago

git rebase main is key

lavanyaj3 commented 4 weeks ago

Raised another PR for this issue . PR number : #119

fbricon commented 3 weeks ago

Closed in favour of #119