Attention is currently required from: Felix Singer, Thomas Heijligen, Shreeyash .
1 comment:
File stlinkv3_spi.c:
Patch Set #1, Line 501: stlinkv3_handle = usb_dev_get_by_vid_pid_serial(usb_ctx,
First, thanks for taking the time to write such a detailed explanation of how the dev cycle works.
Second, Following my to-do list, I did 1,2 and edited stlinkv3_spi.c, to add a comment over the only change that this patch does. `git commit --amend` after returns
```
fatal: You are in the middle of a cherry-pick -- cannot amend.
```
Again, How do I update a commit?
Which commands did you run before? Looks like you cherry-picked something (probably a change from Gerrit) and there are merge conflicts. `git status` usually gives you a lot of information on what to do, it should tell you how to finish the cherry-pick.
Also, apologies for such delays in replies (and any action), got caught up in university exams.
No worries.
To view, visit change 66225. To unsubscribe, or for help writing mail filters, visit settings.