-
sgp_how can I delete the image from this MR? repo.getmonero.org/monero-project/m…nero-site/merge_requests/1207/diffs
-
selstasgp_: remove it locally and force push
-
sarangDo you have the MR set to squash commits?
-
sarangOtherwise the merge would include all your auxiliary commits
-
sgp_sarang: yes
-
sgp_honestly at this point I'd rather just close the MR and start over. using another computer for this so doing the other process out of the browser would be tedious
-
sarangYou don't need to do that
-
sarangYou can do a soft reset of the intermediate commits, which keeps your changes
-
sarangThen make a single new commit encompassing the changes, and force-push that
-
sarangThen the MR has one commit
-
sarangIt's pretty straightforward
-
sarang`git reset --soft HEAD~number_of_commits`
-
sarang`git add . && git commit -m 'Here are all the changes now'`
-
sarang`git push --force`
-
sarangshould do it, I think
-
sarangOh, you're doing this from the web interface... not sure how to handle it from there
-
sgp_sarang: yeah, opened 1208 instead
-
sarangYou have my thumbs-up
-
sarangWould be nice to have an option to squash commits from the web interface; seems pretty common
-
sarangBut I suppose that's the reason for the "squash commits" option that applies on merge
-
koeit annoys the hell out of me you cant squash commits from web interface
-
ErCiccione[m].merge+ #1208
-
xmr-prAdded
-
Mochi101.merge+ 23454
-
Mochi101.merge+ #23454
-
xmr-prAdded
-
Mochi101oh come on
-
Mochi101That's not very secure.
-
Mochi101.merge- #23454
-
xmr-prRemoved
-
Mochi101:D
-
ErCiccione[m]What do you mean it's not secure? Luigi is not going to merge stuff if it's not reviewed anyway. The bot only makes the process easier
-
Mochi101ah ok