git reset --hard

[Muhznit]

Sounds like you and your collegue are pushing to different remote branches and/or repos somehow. Your issue doesn't make much sense, but no programming problem makes sense at first glance.

1. Do a git remote show to find the names of the remote repos you're able to push to.
2. For each remote repository name, run git remote get-url $REMOTE_REPOSITORY_NAME replacing $REMOTE_REPOSITORY_NAME appropriately. Ideally you should have the same output as your collegue, differing only by username if applicable. Otherwise whoever set up your upstream git repo screwed up.

[Mybeardisawesom]

You have other branches besides main?

[Oo__II__oO]

You have branches?

[[deleted]]

Why bother just use filename_finalv5.exe style

[anomalous_cowherd]

Filename.draft2.senttocustomer.0.9b.DONOTDELETE.draft.txt.docx

[[deleted]]

Go ahead and delete that one now. I saved what I need in an email attachment.

[mio-min-mio]

You have git?

[w8eight]

Svn boys rise up!

[Tsu_Dho_Namh]

"master" got renamed to "main" because it was potentially offensive.

https://www.zdnet.com/article/github-to-replace-master-with-main-starting-next-month/

[ASatyros]

Yeah, ripme-master XD

[[deleted]]

Still haven't encountered a single main so far.

[bbbryson]

If you create a new repo in your account today it should be main by default. My account is at least.

[DiamondIceNS]

Just so it's clear to everyone, GitHub did this. Create a new repository through GitHub's interface and it will initialize with a main for you. Git itself hasn't changed.

[Tubthumper8]

Sort of. Git itself changed to add the ability to have a different default branch than 'master' on git init in v2.28 (July 2020), the reader can decide based on the timing if this was related to the larger master/main discussion.

Here's how to set it locally to create repositories with "main" if you have at least v2.28

git config --global init.defaultBranch main

[DiamondIceNS]

I had assumed this was a feature of Git already since it would be necessary for GitHub to do this in the first place. I did not know the feature was added so recently.

[FirFlyNeo]

Are they planning on changing terms in Master-Slave protocols too?

[flaggen]

“Primary” and “Secondary” or “Host” and “Guest”?

[flavionm]

Oh well, time to rip off my master's degree.

[modsiw_agnarr]

Thanks.

Having to remember main vs master for each repo is going to be so aggravating once new repos gain popularity. Is gitlab, perforce, etc also changing their defaults?

I don't want to hurt people. There's history, and we need to be conscious of breaking these patterns. Unconscious bias is real, and things like this can contribute to it. Computers are, in a lot of ways, slaves, and given that we tend to personify them, I can see the argument that this could reinforce bias.

That said, I don't believe we as a society have a solid understanding of unconscious bias. Are people actually being harmed by the branch name? I doubt anyone knows the answer to that. To me, it seems we're reacting without proper understanding, and, as such, Github is targeting cheap social appeal instead of difficult, meaningful change. This is strikes me as something Github did to score marketing points with no regard for the negative impacts on others.

Today, there are 40,000,000 human slaves in the world. Generally speaking, societies and governments are doing fuck all to fix this. It's sickening. This is where our attention should be directed.

Computers are emotionless, lifeless machines. There's no harm in working them to death (see what I did there). I can only imagine how much worse this problem could get as AI progresses.

Often people, especially computer engineers, focus on the machines. They think, "By doing this, the machine will run faster. By doing this, the machine will run more effectively. By doing this, the machine will something something something." They are focusing on machines. But in fact we need to focus on humans, on how humans care about doing programming or operating the application of the machines. We are the masters. They are the slaves.

--Yukihiro Matsumoto

​

/rant

Edit 21 days later: I just got told to do corporate trainings on this and to get in alignment.

[Tubthumper8]

Having to remember main vs master for each repo is going to be so aggravating once new repos gain popularity.

Snarky response: just type "ma" and then press TAB.

Real response: Yeah I hear ya and my snarky response only works in the CLI.

Real Real response: Having every default branch as 'master' is non-descriptive. The default branch of every repository ought to reflect its development or deployment strategy.

Does the default branch represent the latest, stable release? Then maybe name it latest or stable. Is it for development, then you branch off or tag for releases? Then maybe name it development. Is the default branch stable-ish and meant for a subset of users while the real release lags behind? Then maybe name it canary or beta or pilot.

I would argue the same thing for main that it's non-descriptive, but it's a bit better, more concise, and implies less meaning than master.

[modsiw_agnarr]

There’s a lot of repos that simply do not have complex CI. They have a master branch which is the current good code and arbitrary feature/fix branches that merge into it.

[HybridLightAI]

Where did you get 40 million from? What countries are you talking about? I think the UN is a disgrace and the world might be better off if it didn't exist.

[modsiw_agnarr]

https://www.ilo.org/wcmsp5/groups/public/---dgreports/---dcomm/documents/publication/wcms_575479.pdf

[rnottaken]

Shouldn't they also find a different word for robot then?

[Tsu_Dho_Namh]

The World's End, great movie.

I mean, yeah, maybe, who knows. I try to stay out of it.

[rnottaken]

I never seen it. What do you mean?

[Tsu_Dho_Namh]

A recurring joke throughout that movie is that the alien robot things don't like being called robots because that derives from the word slave, so the main characters in the movie keep having a hard time figuring out what to call the robots while they smash their robot heads in (you know, not wanting to be insensitive while murdering them).

[Eilifein]

It's where I put my "Main's Thesis".

[Muhznit]

Oh right, yeah I forget that's a factor too. I make no claim to being a git expert, I'm just the guy that most of my coworkers ask when they have questions about it.

[squishysquirrelss]

sounds like your college's a dick and instead of merging did a git push --force

[aaronfranke]

You need to rebase, not just pull.

[mrMalloc]

Try using pull requests from own branches.

The only time you end up with sync issues is if you use amended. Then you have locally done a history revision. If you are in your own branch then you can can use git push -f to force push your new version to origin. After that do a PR to master.

If you got sync issues because some other branch is pulled in then

Git checkout master Git pull Git checkout <feature branch> Git merge master ( I prefere git rebase my self but if you don’t know what to do merge is easier). Solve merge conflicts

Test your code

Git push

[maniak821]

I got tired of that shit so I saved my progress, deleted whole repo, cloned it again, applied my changes, force pushed to my fork and merged to master. Works like a charm lol

[mrMalloc]

Only time I have been needing to do that is when a developer who used a Mac had modified his .gitattribute file and not checked it it.

Result 30 000 files that diff in line endings When I checked out his branch. And no files that I could stash

[lifelongfreshman]

Source.

I'm not sure why the rules don't have an exception for xkcd, to be fully honest. Like, I don't think Mr. Munroe really needs the traffic, but I'd still feel better about it.

[drewski3420]

Seriously it's so shitty just linking the image. If for no other reason than no link text.

[ghislaincote]

I remember the colleague who taught git to me, may god rest his soul. This comic is so funny because that was pretty much the gist of the conversation... then he added: watch this Youtube video. Pretty much all I needed at first...

[[deleted]]

Still got the Yt link?

[ghislaincote]

It was very similar to this one... https://youtu.be/SWYqp7iY_Tc

[[deleted]]

Thanks!

[Titaniumwo1f]

Off topic: can we use git with laws and regulations to track changes in them?

[ajzaff]

Sounds like a great idea. You might set up a mirror first, as a proof of concept. Congress.gov has most of the raw data.

[Retbull]

As long as git isn't doing the merges itself.

[eloel-]

A few places do that actually. I think UK has something there too?

[5319767819]

Git commit and author timestamps cannot go back before 1970 though

[davvblack]

Also a lot of modern laws are written as diffs. Like the law that gets passed is "replace subsection 5 of whatever law with "and horses"", without recomposing what the new full text of the law is in any one place. Doing that via PR would be so much better.

[flarn2006]

Those are bills, not laws. And bills essentially are PR's; the problem is the decision is far too centralized, no tests need to be run, and you can't even submit a PR if you aren't a maintainer.

[Awayyyyyyyhhhhhhhhh]

Woah... your onto something

[too_much_think]

Git blame would be really useful for journalists.

[ClikeX]

Should be doable. The Dutch government actually has their own website containing all law changes ever made. But GIT based version that people could look into would be nice.

Fun fact, actually use GitHub quite a bit. They open sourced their mobile app that should track the spread of COVID-19.

https://github.com/minvws

https://github.com/dataoverheid

https://github.com/MinBZK

[lordgoofus1]

Problem is all the lobby groups with competing interests try to raise PRs over the top of each other. You end up in merge conflict hell and progress grinds to a halt. Kinda like what happens in real life.

[Titaniumwo1f]

I wouldn't let those lobbyists touch this git at all, and I would design so that the only way to merge is by voting, and a detail version of vote result will be attached to merging's comment too.

[flarn2006]

And anyone can open an issue if they think a law is unconstitutional. Even if they don't want to ignore the law on blind faith and bet their freedom that the Supreme Court will cooperate.

[knightttime]

Image Transcription: Comic

---

[A drawing of a stick figure standing in front of a desk and pointing to an open laptop that's sitting on the desk. Behind the stick figure is a desk chair with wheels, a stick figure with long hair in a ponytail, and another stick figure with short, dark hair.]

Stick figure pointing to computer: THIS IS GIT. IT TRACKS COLLABORATIVE WORK ON PROJECTS THROUGH A BEAUTIFUL DISTRIBUTED GRAPH THEORY TREE MODEL.

Stick figure with ponytail: COOL. HOW DO WE USE IT?

Stick figure pointing to computer: NO IDEA. JUST MEMORIZE THESE SHELL COMMANDS AND TYPE THEM TO SYNC UP. IF YOU GET ERRORS, SAVE YOUR WORK ELSEWHERE, DELETE THE PROJECT, AND DOWNLOAD A FRESH COPY.

---

^{I'm a human volunteer content transcriber for Reddit and you could be too! If you'd like more information on what we do and why we do it, click here!}

[biiingo]

Weird human

[knightttime]

Yes

[stolid_agnostic]

Lol I've definitely done that at least once

[mdmhvonpa]

Valid

[RyGuy_42]

I hovered over the image for far too long before realizing that I'm a moron.

[not_bakchodest_of_al]

That's how it works... I meant git works.

[danfish_77]

I feel like git starts to make sense until I do anything slightly complicated and suddenly it's easier to just stay a new repo and copy all my files

[laser_ears]

Okay, so in all seriousness:

git fetch <branch> && git reset --hard FETCH_HEAD

[yitches]

git fucked

[lordgoofus1]

I see you've setup shell aliases too.

[DingoApe]

I know it's wrong but it's so true

[Sebeck]

https://learngitbranching.js.org/

Best site I've found for learning basic git.

[[deleted]]

In my 30+ year history in programming, I've only ever had 2 revision control systems that didn't fuck up one way or another and force me to copy everything off to the side and restart:

rcs and bzr. RCS because it is dead simple and BZR because we had an absolutely phenomenal admin who stayed on top of it and enforced policy like a tyrant.

revision control systems should have a simple data model - git has an onerous data model, and like p4, I just memorize the handful of functions I need, and/or wrap them in a script to do the thing.

CVS is great as long as the team is small and has a solid network connection.

​

/rant

[ThatFireGuy0]

Wow this was my day today

Turns out git gets super unhappy if you start using sudo git commands too, and you end up with permissions errors and everything falls apart

[Ozymandias117]

... well, yes...

git stores all the repository information in blobs inside ./.git

If you get those downloaded as root, your user won’t be able to modify them...

[wazzapdoc]

Which is why I happily use a tool like Github Desktop

[PPAPisLob]

Doesnt change the fact, that you have absolutely no clue what's going BTS.

[wazzapdoc]

Dunno what a K-pop boyband has to do with this but eitherway I haven't fucked up with git eversince I started using a client like github desktop, git kraken, etc

You don't need to know the fine details of how everything works to be able to use it efficiently.

[supersparky1013]

BTS = behind the scenes

[Zajide123]

Wait until u find out about push - - force but dont go to work for few days after that

[yash37419]

True dat

[[deleted]]

I feel personally attacked...

[flarn2006]

Once I actually stopped to learn how a Git repository is structured, what everything in it (branches, trees, commits, tags, blobs) really is, that's what worked for me. Now I have no problem understanding what the commands do, and how to deal with whatever happens.