Help panel implementation

Siddhi-agg commented 9 months ago

Hey @panglesd , I thought of creating a new PR because of commit author issues in the previous #34 PR.

This PR aims to solve issue #11. I will continue my work from here on and keep pushing it for you to review.

panglesd commented 9 months ago

Sure! Next week I'll be off, so ping @Julow for reviews.

Siddhi-agg commented 9 months ago

Sure thing!

Siddhi-agg commented 9 months ago

@panglesd @Julow I have implemented the help panel and it works fine on my local setup. Please review my PR.

Julow commented 8 months ago

Unfortunately, there's now a conflict with the main branch. Don't hesitate to ask if you have a problem with this.

Siddhi-agg commented 8 months ago

Unfortunately, there's now a conflict with the main branch. Don't hesitate to ask if you have a problem with this.

Since my changes are mostly in the view function and much hasn't been added to it, I think the conflict would not be very difficult to resolve. This is my first time dealing with conflicts, so I apologize if I am wrong.

Also, if I can help in any way in the resolution, I would be glad to.

Julow commented 8 months ago

How the resolving of conflicts is going ?

Siddhi-agg commented 8 months ago

Hi @Julow , Is this the expected behaviour after successfully resolving merge conflicts. I am also wondering why my commits are being committed twice, In the start of the PR and now when I tried to resolve the conflicts.

Julow commented 8 months ago

It seems that you rebased the main branch over your branch, resulting in a slightly different version of the main branch. You then rebased your other commits on top of that.

You can fix this using interactive rebase:

Type git rebase -i main. This will open your editor with a list of commits, remove the commits that aren't from you. Save and quit. Rebase should now have started.

Use git status to see in what state you are. Or even better, the VCS tab in vscode. You might be in a conflict state: in this case, edit the files containing the conflict markers (starts with <<<<<<<). When this is done, stage the files with git add (or from vscode) and do git rebase --continue.

This might find an other conflict.

Siddhi-agg commented 8 months ago

Hi, I am having a bit trouble pulling from the main branch, When I am trying to pull through rebase main, and then resolve conflict, My first commit is getting committed twice, and when I am trying to fetch changes through fetch command and then doing merge origin/main, All the files are getting added as if I am committing them. I have force pushed to my original commits without the other changes.

Can you please help me with this.

Julow commented 8 months ago

You can separate the pulling and the rebasing:

Go to the main branch git checkout main
Pull git pull origin main (if origin is not this repository, change it)
Go back to your branch git checkout patch-help-panel
Do the interactive rebase git rebase -i main.

Julow commented 8 months ago

An other tips: on your branch, squash the commits using git rebase -i @~4 and changing all the commands to squash instead of pick, except for the first one.

panglesd commented 8 months ago

@Siddhi-agg let us know if you need more help with the rebase!

Siddhi-agg commented 8 months ago

@panglesd I tried to resolve conflicts the way you said. But I don't know why the <<<<<<<<<<<<HEAD is coming into my code. Also, I already had a zipper.ml in my branch and it got commited twice in the PR. Can you please tell me what I should do now?

panglesd commented 8 months ago

My suggestion would be the following, since the changes is not too big and the history not important:

checkout the main branch, pull the latest changes, and start a new branch from there
Use this PR's "change tab" to remember what were your changes, and adapt the changes to the latest change if needed.
Commit in the new branch.
Close this PR and open a new one.

Sorry, it is quite hard to help with git without knowing exactly what you did and what is your local state! But in any case, confidence with git rebases comes with experience!

panglesd commented 8 months ago

The "<<<<<<<<<<<<<HEAD" line is coming when there are conflicts in your rebase: your commits modified some lines of the codebase, but these lines were also modified by commits on which you rebase. Git cannot resolve such conflicts alone, so it leaves both versions (separated with the <<<<<<<<) and leaves to you the responsibility of resolving the conflict.

Siddhi-agg commented 8 months ago

I see, I understood a lot of things through this PR, Especially about Git and resolving conflicts. Thanks for motivating me to further continue my work. I will open a new PR for the implementation.

panglesd / diffcessible

Help panel implementation #35