Git master branch will be reset

[Graf Zahl]

An innocent looking pull request I merged today needs to be corrected due to bad line endings which cause commit conflicts on Windows. This cannot be done without resetting the branch so everybody is advised to do a clean checkout once I post a notification here that the issue has been fixed.

[Graf Zahl]

All should be ok now. Again, please make sure you do a clean checkout of origin/master after pulling next time!

[Rachael]

Thank you for the warning, I would've unwittingly committed them right back after I had tested the UDMF property for 'friendlyseeblocks'.

[Blue Shadow]

How do you do that, precisely?

[Graf Zahl]

Do what, precisely?

[Blue Shadow]

The clean checkout.

[Rachael]

Code: Select all

git fetch --all
git checkout -B master origin/master

Assuming you are using an actual gzdoom clone, and not a single repository that is jury-rigged together from multiple sources. If you have that kind of a setup, then you probably already know how to remove and recreate branches to serve this purpose.

[Blue Shadow]

Assuming you are using an actual gzdoom clone

I'm not cloning GZDoom directly. I have a fork, which what I'm cloning. I pull from upstream to update my local repository. Does this clean checkout still apply, then?

[_mental_]

If you were not pulled deleted commit(s) then no. IIRC attempt to pull from force pushed branch will end with error.

[Blue Shadow]

Okay, thanks. That means I don't need to do it, because I didn't pull those commits.

[Graf Zahl]

If you use a GUI tool the simplest way is to just move the branch label to the commit where you want it.

[Major Cooke]

All I do is "reset branch to commit" and set it to hard using SourceTree.


That's just a local branch that's not even pushed, and never will be. For compiling purposes only.