nouv

signed distance fieldmouse

@nouv

still the nouv 1989

avatar by buizelbub!
header by pinnapop!
ΘΔ

log inask
nouv
@nouv

git-heads please help

there is a Pull Request from a year ago that i want to take over and finish up

i need to:

  1. get these changes
  2. sync them up with the repo's current state (yes i will have to solve merge conflicts, it's ok)
  3. push them to my own fork

the github desktop app doesn't support this workflow at all, apparently, and refuses to let me push to anything but upstream (?????????)

i am reaching the classic "doing something fuck-simple in git" point where it would be vastly easier to just merge these changes by hand in a text editor than actually engage with the version control system

how do i do this

edit

ok so:

after pulling down the main repo,
first, you run git fetch https://web.zone/other/fork/repo.git theirBranch:yourNameForTheirBranch

then you can git checkout yourNameForTheirBranch and do your git pull --rebase origin mainOrWhateverTheyCallTheirMainBranch to sync up.

and Then you can finally push it wherever.

You must log in to comment.

in reply to @nouv's post:

kobold-wyx
@kobold-wyx

do you have a separate origin set up? sounds like 2 diff ones

usually i'm lazy and just copy the files over but if you do this often enough then you probably need to add an origin in then you can do the same commands just make sure you specify the repo in your commands

login to reply
nouv
@nouv

i want to contribute to Main Repo, and so Main Repo is my origin, yeah
but Pull Request doesn't live on Main Repo, because it's a pull request and not a pull success, so i have to go over to Some Guy's Fork to grab the code from their PR
i edited the post w/ the solution i ended up using

login to reply