Create account / Log in

Git weirding out

Discussion area for the development team.

Moderators: uckelman, Tim M

Git weirding out

Postby Cattlesquat » July 27th, 2020, 6:34 pm

Hey Flint1b -- saw your message in that PR. Somehow my github version of master must be screwed up? We had some PR-into-PR merging/reverting shenanigans last night. Not sure why it's still doing that, but might need help straightening it back out.
User avatar
Cattlesquat
 
Posts: 953
Joined: December 2nd, 2019, 4:57 pm
Location: Baltimore, Maryland, USA

Re: Git weirding out

Postby Cattlesquat » July 27th, 2020, 6:45 pm

Might have found it. StackOverflow to the rescue...
User avatar
Cattlesquat
 
Posts: 953
Joined: December 2nd, 2019, 4:57 pm
Location: Baltimore, Maryland, USA

Re: Git weirding out

Postby Cattlesquat » July 27th, 2020, 6:49 pm

# ensures current branch is master
git checkout master

# pulls all new commits made to upstream/master
git pull upstream master

# this will delete all your local changes to master
git reset --hard upstream/master

# take care, this will delete all your changes on your forked master
git push origin master --force
User avatar
Cattlesquat
 
Posts: 953
Joined: December 2nd, 2019, 4:57 pm
Location: Baltimore, Maryland, USA

Re: Git weirding out

Postby Flint1b » July 27th, 2020, 8:40 pm

I'm late, you figured it out already..

Git reset looks good, I would have tried something with git reset as well.
User avatar
Flint1b
 
Posts: 461
Joined: May 19th, 2020, 12:27 am
Location: Colonia Agrippina

Re: Git weirding out

Postby Cattlesquat » July 27th, 2020, 9:23 pm

Yeah I wiped that PR and opened a clean one -- no point in a bunch of cleanup hassle over like 6 lines of code.
User avatar
Cattlesquat
 
Posts: 953
Joined: December 2nd, 2019, 4:57 pm
Location: Baltimore, Maryland, USA


Return to Developers

Who is online

Users browsing this forum: No registered users and 4 guests

cron