Attention is currently required from: Felix Singer, Thomas Heijligen, Angel Pons.
View Change
1 comment:
File stlinkv3_spi.c:
Patch Set #1, Line 501: stlinkv3_handle = usb_dev_get_by_vid_pid_serial(usb_ctx,
Yes, you likely have to `git add` the modified files first, and then `git cherry-pick --continue`
So, "fixing conflicts" is essentially making my changes? What's the "conflict" here?
To view, visit change 66225. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I7ce156a9f7455434ea461560320c84660c93c02f
Gerrit-Change-Number: 66225
Gerrit-PatchSet: 2
Gerrit-Owner: Shreeyash <shreeyash335@gmail.com>
Gerrit-Reviewer: Anastasia Klimchuk <aklm@chromium.org>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Felix Singer <felixsinger@posteo.net>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Nico Huber <nico.h@gmx.de>
Gerrit-CC: Thomas Heijligen <src@posteo.de>
Gerrit-Attention: Felix Singer <felixsinger@posteo.net>
Gerrit-Attention: Thomas Heijligen <src@posteo.de>
Gerrit-Attention: Angel Pons <th3fanbus@gmail.com>
Gerrit-Comment-Date: Fri, 21 Oct 2022 16:48:29 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Thomas Heijligen <src@posteo.de>
Comment-In-Reply-To: Angel Pons <th3fanbus@gmail.com>
Comment-In-Reply-To: Shreeyash <shreeyash335@gmail.com>
Comment-In-Reply-To: Alexander Goncharov <chat@joursoir.net>
Gerrit-MessageType: comment