On Thu Sep 21 09:50:20 2023 +0000, Petrichor Park wrote:
Oh dear. Do I need to worry about the big scary warning at the top saying that my merge failed? I don't think I did this right.
No, you didn't. Don't stress too much over it, though, git is nice folk, but it's a well established fact that it's not one with whom it's immediately easy to make friends. Hoping to help, here is what I would do now: ```sh git checkout master git pull # Ensure that your master is up-to-date git checkout impl-tangent git reset --hard b54b3c60 # Recover your last known-good state of this branch (I got the commit hash from the MR history) git log git show # Check that's what you intend to submit git rebase master # Magic is happening here! Basically your commit is replayed as if it was replayed on top of master # Git will tell you there is a conflict: basically you added line `{"tan", ...},` in `hlsl.y` and, in the same place, # Nikolay added line `{"tex1D", ...},` a few days ago (commit c5d680d141; how do I know? I used git blame) # Solving this conflict is simple: both lines have to appear in the file, so edit the file and just remove # the markers git added around the conflict; but they also have to be in alphabetic order, so perhaps you'll have to swap them git add -u # This is probably not needed, because git will automatically detect you fixed the conflict; but if it doesn't happen that's how you add the changes to the index git diff --cached # Check that the diff now looks correct git rebase --continue # Tell git that the conflict is resolved and it can carry on with the rebase git log git show # Check again before force-pushing, one is never too sure git push -f # The MR is now updated and the scary warning should go away ```
Please feel free to ask if I can help you further.
-
Giovanni Mascellani (＠giomasce)