[20:30:34] <SomeRandomDev>	 Hi, I have an open gerrit patchset that depends on another one. Both were marked as having merge conflicts today, so I rebased the first one as described in the gerrit troubleshooting guide, and it's fixed. Now I am trying to rebase the second one, which depends on the first, so I did "git rebase review/somerandomdeveloper/T326057" (which is the
[20:30:35] <SomeRandomDev>	 branch for the first one). Now it wants me to fix merge conflicts for the commit of the first patchset. Since I already resolved those on the branch of the first patchset, should I still resolve them (again) or is there a better way to do this?
[20:36:14] <MatmaRex>	 SomeRandomDev: yes, there's a better way. the problem is that Git is trying to apply the old version of the first commit on top of the new version of the first commit (because the second commit is on top of the old version of the first commit)
[20:37:12] <MatmaRex>	 SomeRandomDev: if you want to do it in the terminal, try doing `git rebase -i review/somerandomdeveloper/T326057` (with the `-i` option, for interactive rebase), and then once it shows you the list of commits, remove the old version of the first commit from it (just delete that line)
[20:38:02] <Reedy>	 Or just cherry pick them onto master
[20:38:04] <MatmaRex>	 SomeRandomDev: it might be easier to do it from Gerrit's interface though, just click "Rebase" and OK - if there are no real conflicts in the second commit, it will succeed
[20:40:50] <SomeRandomDev>	 oh, I didn't even see that option in Gerrit before. it worked, thank you!
[20:40:55] <MatmaRex>	 right, checking out the 2nd commit and rebasing it on top of the 1st commit is basically the same as checking out the 1st commit and cherry-picking the 2nd commit on top of it