OpenOCD Review

[epasveer]

New issue to create a branch for reviewing the OpenOCD work by @QuangNguyenMinh123

[QuangNguyenMinh123]

Actually, @epasveer , you're the one who needs to create that branch (red branch)
I'll create a MR to merge to red branch

[epasveer]

Actually, @epasveer , you're the one who needs to create that branch (red branch)

Hi @QuangNguyenMinh123

I guess I don't understand. I created the "447-openocd-review" branch off of "main". Is that not correct? I would think that is the "red branch".

[QuangNguyenMinh123]

Yes, correct. I'll be the one who create the other branch

[QuangNguyenMinh123]

Please rebase the branch 447 to main
Thanks you

[epasveer]

Let me go over what is in branch 447 first.

BTW, I just got a new job. That's why I haven't been jumping on things right away. I will be able to spend some time this weekend.

[epasveer]

Please rebase the branch 447 to main

There are no changes in 447 (I think). Are you asking I update 447 with the contents of "main"? Or the other way around?

Thanks.

[QuangNguyenMinh123]

It's weird
As in #448, I see that there're 35 files has been changed
So I thought 447 hasn't been rebased to main

[epasveer]

I must admit, I don't know much about the term "rebase" means, and what it does. (Just a lack of my understanding with git).

[epasveer]

I thought you were going to merge off the 447 branch.

[QuangNguyenMinh123]

Have a look

The MAINLINE is your repo, while QUANGNM is mine (I named it that way for clarity)
Look at branch 447 in bellow of the picture, it was created on 24 march
And on branch main of MAINLINE (your repo), latest update is on 11 Apr

Which mean, the branch 447 doesn't have latest change with MAINLINE/main
In other word, the branch 447 is "behind" the MAINLINE/main

In #448, I only have few files have been changed
But the github tells me that, IF i merge my branch to branch 447, there're 35 file have been changed

Why?
Because from 24 march to 11 apr, there are a lots of commits. And in total (I'm sure), there have been 35 files have been changed

[QuangNguyenMinh123]

So how to review 35 changed files?
You don't

Instead, git has option "rebase"
In which, if you checkout at 447 and run "git rebase origin/main", the branch 447 won't "behind" the main anymore, it will "ahead" with branch main

Look at my git.
After rebase my openocd branch to latest change in main, it will "ahead" branch main
So, This will reduce the number of files have been changed on git MR

[QuangNguyenMinh123]

in short, to reduce number of changed files in MR

1. check out at branch 447
2. run: "git fetch --all" to get latest changes
3. run: "git rebase origin/main"
4. run: "git push origin HEAD:447-openocd-review --force-with-lease"

By the way, do you use vscode?

[epasveer]

No, I just use command line.

So I think we're talking about the same thing. When I have a branch, and I want to update it with changes from "main", I do this:

$ git checkout main
$ git pull
$ git checkout mybranch
$ git merge main
$ git commit
$ git push

Now "mybranch" has it's changes, plus anything new that was in "main". Using this method, "mybranch" will be "ahead" of "main".

I think it's the same thing as yours, just with different commands.