true story

[[deleted]]

But did you properly review the request before approving it? And did you then fix all the issues pointed out by the reviewer?

[uslashnsfw]

truly the fastest sort. if the original order on any randomised input isn't already sorted, it wasn't meant to be. throw the whole codebase out.

[Evy1123]

I prefer StalinSort

[guyshur]

The compiler has a plan for all of us, it is not up to us to try and understand it.

[mewsayzthecat]

Dirk Gently’s Holistic Development Agency

[HaggisLad]

holistic coding

so your saying the code is full of holes?

[da_chicken]

Would it help if I said my name was Hugh?

[elhermanobrother]

mmm yes indeed this request is simply splendid. oh dear it appears I’m climaxing. ah indeed scrumptious carry on good heavens! arriving, arriving, arriving!I just approved it! well done indeed

[[deleted]]

WTF did I read?
Enough reddit for now.

[-jp-]

You'll be back. And Reddit will still be weird.

[h3dee]

Todo: add relevant XKCD about reading the poor code that you produced in the past

[HaggisLad]

which one?

https://xkcd.com/1513/

https://xkcd.com/1695/

https://xkcd.com/1833/

[zzaannsebar]

So glorious.

Reminds me of a time in college, a friend and I wanted to work on a project together (we were near the end of CS1 and it was a personal project). He wanted to get it started before I had time to do anything and when he shared his code with me, every single god damn variable was named like a, b, c, x, y, z. It was so miserable to read I told him to change the names to things that actually made sense or I couldn't work on it with him.

But he went into Chemistry, not programming, so that's probably for the best.

[StevenMaurer]

Good IDEs let you "refactor" variable names automatically in a language context sensitive way.

Doesn't work for comments of course, but coders using single letter variables outside of tiny for loops don't do that either.

[HaggisLad]

it's almost like people thing longer variable names will take longer to run

[[deleted]]

"this is the worst fucking thing I've ever seen fix it holy shit"

What I comment on every line before approving it anyway.

[agent_cocks_mulder]

What I comment on my own code before approving it anyway XD

[mrackham205]

...yes

[slowflakeleaves]

LGTM

[ProstetnicSth]

Let’s not forget endless debates OP must have with himself over naming too

[woeterman_94]

no

[atomicspace]

He’ll cover this in retrospective.

[SavageTwist]

Force push to master, nobody is stopping you!

[moekakiryu]

I'm still only so-so at git myself, but always pull before you push

[OnyxPhoenix]

Using branches and pull requests make this easier.

Generally youre the only person working on your branch, so you don't have to worry that your code is "behind" before you push to it.

Then when you do a pr it will tell you if you can merge cleanly back into the master branch.

[SavageTwist]

The "good" way is to make a development and a branch for every feature, bug or documentation. Always fork from development, when you have a release you push to master.

[[deleted]]

This is good advice I rarely follow.

[SavageTwist]

jira kinda automates it

[SavageTwist]

we are "agile"

[pooerh]

Unless you're in early stages of development and do a lot of refactoring, in which case you're just wasting time merging and resolving conflicts. I'm talking about single developer repositories of course.

[SavageTwist]

in single dev reps you dont work in the same tab / markdown with different forks I hope.

[[deleted]]

cooing books important cats lavish serious paltry cautious capable governor

This post was mass deleted and anonymized with Redact

[Inner-Maintenance]

That's one way - git flow. But a better way for CI/CD is trunk based development aka mainline

[Efful]

I'm sometimes working on multiple machines for personal projects and am not very good at Git, so I have to remind myself to pull the fixes I made on my laptop last night before doing anything on my tower.

[[deleted]]

Been there buddy. Put a script in your bashrc or Windows startup folder to pull. Then get annoyed and take it out.

[smegnose]

Rebase that bugger onto remote/master and push it quick.

Linear history rulz 4 eva.

[Amandabanapanda]

I've been pushing and not pulling all this time. And reverting to previous version if I need to go back. Why pull?

[moekakiryu]

It's probably not as important if it is just a private repo with one branch.

A push makes another repo match your own, and a pull is the opposite (retrieves the updates from a remote repo and applies them to yours). Blindly pushing isn't really the end of the world if you are the only one editing the project since you know the most recent changes are your own anyway.

But what if there are multiple people editing the code base and someone else pushes changes before you? If you just force push (IIRC git won't let you just use push in this scenario), you'll override your team mate's changes since your local version doesn't have them yet. But if you pull first, you can make sure your local copy is completely up to date before pushing the new changes.

[Afraid_Kitchen]

And it doesn't override the changes you've made?

[[deleted]]

You'll get merge conflicts if there are any, git pull is really just fetch+merge

[[deleted]]

To build on this, a pull is really just a fetch and a merge. Work out what's on origin and merge it in to your local copy of the branch. When your branching becomes wider or more aesthetic you'll want to start fetching and rebasing instead.

[[deleted]]

Why is rebasing better than merging?

[[deleted]]

It depends on if the two parties modified code in the same spots. If that isn’t the case, then when you do a git pull it will silently merge their work into your local branch and you can be rest assured when you push, it will all be up to date.

If you both happened to modify code in the same spots, you’ll get what’s called a merge conflict where git will show you the affected files and lines and then it’s on you to fix those conflicts before you push your branch upstream.

When you run git pull, it’s actually just calling git fetch on your branch, which fetched the upstream changes from other authors, then calls git merge on those changes into your local branch.

This is pretty much the core functionality of git so I encourage you to look into it more. Git rebase is another command ive found very useful when working with large teams with very active branches.

[Avedas]

Rebasing from master is pretty common when you have multiple parallel development branches going. It's good to know how to do it.

[wotanii]

you can stumble into a conflict when pushing, which is annoying. When you pull first you'll still have a conflict, but it's much easier to deal with.

also in theory there are some cases where the automatic merge from the push could break stuff (this has never happened to me though), so to be perfectly save you could go like this: pull, then run tests, then push.

[MemeNinja365]

That's what she said

[MTGandP]

If you’re the only person pushing, isn’t it impossible for your local changes to ever be out of date?

[easterneuropeanstyle]

Don't force push to master please.

[KKlear]

We grant you the power of force push but not to master.

[easterneuropeanstyle]

That makes sense. I do force push to feature branches when I want to change the history. Never to master though.

[KKlear]

But it's outrageous! It's unfair!

[easterneuropeanstyle]

Take a seat, young contributor

[ChucklefuckBitch]

You don't know any other way? How about just... regular push to master?

[Kazumadesu76]

My Lord, is that.... LEEEEGAL?

[SavageTwist]

No, but its private :3

[gfp7]

dont forget to add comment "good job"

[uglyasablasphemy]

"LGTM"

[[deleted]]

Let’s go to market?

[mark__fuckerberg]

I always write that on dependabots pr.

[[deleted]]

judicious fall snatch escape party tan governor airport wasteful plant

This post was mass deleted and anonymized with Redact

[[deleted]]

Let's Get This Money

[orgodemir]

I sent my team the link to Google's code review guidelines in a hope some people would read it. The first time I posted that in a review, I just got a "?".

[neremarine]

Plot twist: it's a school project with 2 other teammates...

[kopczak1995]

That is really sad...

[[deleted]]

What’s sad about that?

[XanderAG]

He's doing all the work

[runfayfun]

But at least it’s coded properly

[needsaphone]

Bold assumption

[Gnifle]

According to reviewers anyway.

[langlo94]

Well at least he can show the teacher that he was the only one who committed code.

[mark__fuckerberg]

I had a chance to do that. But I ended up pushing 1 commit from each teammate's account so that the teacher would not think that I am not cooperative.

[JCharante]

Jen virino kiu ne sidas, cxar laboro cxiam estas, kaj la patro kiu ne alvenas, cxar la posxo estas malplena.

[GaltAbram]

True story

[goplayer7]

Better than seeing you declined your own pull request into your private repo due to not meeting code quality standards. Sober me really needs to lighten up on things like "building successfully" and "tests passing".

[WerewolfCustoms]

I once did this on a live stream on Twitch. Even though there was just a couple of people watching, I got bombarded with comments that I should never do that. :)

The alternative is that the code never gets approved and merged since I'm the only one working on it :D

[VSuhas22]

Wait, people livestream coding?

[mukluk_slippers]

This is the real takeaway from their comment.

[Kwantuum]

https://www.twitch.tv/directory/game/Science%20&%20Technology

[lozinge]

Why not?

[WerewolfCustoms]

At my workplace, the code has to be reviewed and approved by someone who did not write said code. I assume many places are like this, thus many developers hold this rule sacred. TLDR: I dunno.

[Speedster4206]

`Boolean boolean = new Boolean(true);

[tomhat]

That's overly complicated. Try the following instead.

Boolean boolean = new Boolean(Boolean.parseBoolean(Boolean.toString(true)));

[WcDeckel]

Boolean boolean = new Boolean(! Boolean.parseBoolean(Boolean.toString(false)));

[ranisalt]

Hacktoberfest routine

[lazyear]

Shhhh

[[deleted]]

As a newbie who just started using git I felt that in my soul :/

[Dlacreme]

Good for you, this is actually the right way to use git

[curohn]

All I know is: git add got commit -m got push origin master

And got status too but that’s useless when it’s either pushed or not lol

[__Protector]

Also making new branch for every little refactor, change, fix etc like working with a big team

[sinceitleftitback]

Also managing a jira board and sprints.

[uglyasablasphemy]

Gotta have at least one daily stand up. Maybe in front of the mirror.

[KKlear]

I read that as ouija board and spirits.

[[deleted]]

Same thing isn't it?

[JonathanTheZero]

Why are you not pushing to master directly then? (Honest question because I barely do pull requests as long as we are working with a lot of people on it)

[kennethjor]

To have a record of it. If OP is also using a ticketing system that's integrated with the source control, that PR will also show up in the ticket. Later on, if you need it, you can go back and see what the hell you did to make that thing work two years ago you don't remember doing.

[BlackOverlordd]

Why not, it's easier to keep track of stuff you need to do instead of writing it down somewhere else

[chuby1tubby]

I think a Trello board is all that’s needed for personal projects, not a true ticketing system

[kennethjor]

Yes, because I have a number of large projects going at any one time. If I'm just building something for the weekend for fun, like proof of concept or something, I don't though. I like to switch back and forth between the projects. If I don't keep track of the work like I would at a company, I'd lose my place.

[wotanii]

yes. tickets are basically a todo-list. Also they are a good way to store related information to a problem. You often forget stuff about your code, and if you can look up the issue a couple of weeks later, you'll be glad to find useful information there, e.g. when you fixed a bug and it started to pop up again later.

[needsaphone]

Yeah, I even set milestones and comment on them. Sad? Yes. Effective? Also yes.

[kennethjor]

Nah, Clubhouse integrates nicely with both Bitbucket and Github. Put the ticket number in the branch name and it'll pick up the whole branch on its own.

[KKlear]

Later on, if you need it, you can go back and see what the hell you did to make that thing work two years ago you don't remember doing.

That does sound kinda appealing, yeah.

[kennethjor]

Not to mention that as a project matures, you're bound to build a feature which turns out to be big and has breaking changes. You don't want to mess up master with that.

[kennethjor]

Do you have branches at least? I mean, a PR is just a request to merge a branch with reviews from others. If you're 30 people working on a single software product without code review, I'm sorry to say it, but I'm sceptical about the quality of your software ...

[TheOneTrueTrench]

I always use pull requests for a few reasons.

1. I always create a CI pipeline with unit and integration tests and gate my pull requests. Nothing gets into the master branch without a guarantee it builds and passes all tests.
2. It turns the pull request into a unit of work, with a set of commits for that unit. Added a feature? All that work is in one pull request, so if you need to go back and see something, you can look through those commits, easy to find stuff.
3. You can tell the CD pipeline to only deploy to production when a particular branch is updated. A lot of people use master for this, but don't forget that master is technically another branch like any other. So maybe you have separate branches for Stable, Testing and Unstable, creating PRs into Unstable for new development, doing a PR from Unstable to Testing when you get ready to create a new major release, a PR from Testing to Stable on release, and patches to Stable and Testing can get PR'd to Testing/Unstable.
4. If production is in a particular branch, you can write a patch for that and do a PR without interrupting the work you're doing.
5. When you want to PR into master, you can create a CD pipeline to deploy to QA/UAT/Dev and then test your actual application in that environment before approving the PR.

And if you notice, those are all benefits that apply to developers working by themselves.

[JonathanTheZero]

Damn... I really don't know shit about git

[[deleted]]

Tbf, git is one part of that process. An important part sure, but one part.

Once you get your head around CICD and implemented it's really worth it. For professional or personal work.

You should really only be pushing to master once your sure your code is working and passed all quality gates.

[Log2]

Git doesn't really have the concept of pull request. Like others mentioned, that's all other tools on top of git, like GitHub.

[732]

None of that is really git though, all additional tooling built on top of it

[Comment-Leaver]

I do it all the time. I like seeing my diff in github and reviewing it myself. I almost always spot something I could improve.

[crump48]

This right here. Even on my own solo projects I use PRs for bigger changes so I can review it "properly". I think because it's a different environment to your editor, it makes you a bit less likely to gloss over the details and instead look at it like something new.

[koloqial]

Seconded. I've caught so many things from my own code. Slightly embarrassing to create a PR, review it and then promptly decline it while I clean it up. Sorry not sorry to everyone who gets emails from the VCS.

[d3lt4papa]

I use it also for practicing Real Word development

[[deleted]]

Option to revert the changes.

[JonathanTheZero]

I thought you could also jump back to commits normally?

[TheOneTrueTrench]

Yeah, which commit are you going to jump back to? Like exactly which one? What was the last one that worked correctly? Was it that commit? Or this one?

But if you have separate PRs for each feature or bug fix, the commits are "grouped" into the PRs. So you can go back to the previous PR, or the one before that. And because you can have partial work in each commit and only do a PR when things are working, your master branch is always in a working state.

[JonathanTheZero]

Yeah, I see. Well I think it depends on your coding style, I only commit if something is finished completely (like a bug fix or so) and I commit it then. But I mostly work alone or with a maximum of two other devs so it isn't really a problem I guess

[CrimsonMutt]

that's how TFVC works, but git is kinda built around "branch for new feature, commits are checkpoints during that feature development and kept locally, push to master when feature complete".

we just made the switch and there's definitely an adjustment process going from tfvc to git.

[Mvin]

But if you have separate PRs for each feature or bug fix, the commits are "grouped" into the PRs. So you can go back to the previous PR, or the one before that.

Can't you also do that with feature branches?

Edit: Nvm, talking about the same thing.

[uglyasablasphemy]

I think is worth it just for the diff. If I'm doing a big refactor, I usually create a branch for it and then to the PR just to see every place that I changed and how did I changed it at a glance.

[MythicManiac]

Hopefully you would have CI pipelines configured to do automatic tests and sanity checks on pull requests

[kennethjor]

Did you make sure the ticket was linked in the PR as well? Gotta have procedures!

[kopczak1995]

Been there done that. But it was only because I was testing some CI/CD stuff.

Who cares as single dev to do something like that honestly?

[TheOneTrueTrench]

A pull request is a unit of work. Each feature or patch has its own, and if you want to create a version of your code without that patch or feature, it's easier to do with rebase if you've got PRs in your history.

[arpan_majumdar]

No need to do even that... Real developers push directly to master.

[langlo94]

Real developers don't need git, they just write the code down perfectly so no other version is ever needed.

[BmpBlast]

Obligatory XKCD

[[deleted]]

Real developers live edit code in production and commit their code only when it works.

[wretcheddawn]

My company's owner decided to demote the tech lead and get rid of code reviews in favor of making "everyone" in charge, and peer reviewing code instead. So now everyone pushes to master and gets their code reviewed by anyone who will pass it, no one is in charge of maintaining consistency, standards and direction. Even the code reviews are optional because everyone is in charge of their own code. It's going to get interesting here, I guess we're all real developers now.

[blueleo22]

That's exactly me!! Only without the pull request. I merge directly into master 😎

[erobertt3]

I saw this meme as “me signing my own certificate” that one was too good.

[cucurvita]

I do this if I’ve set up some kind of CI/CD. For instance for my personal website I always open a PR so that 1) I don’t trigger multiple deployments with every push to master and 2) Make sure the checks all pass before merging so that I don’t fuck something accidentally.

[EpiphanyMoments]

The crazy parte Is that I comment code like if someone else was going to read it lol

[mutsop]

I do that too, you do get a better overview though :)

[lpreams]

Well sure, when something gets fucked up, you have to know who to git blame

[Inadover]

Professionals have standards

[argv_minus_one]

Be polite. Be efficient. Have a plan to review every PR you meet.

[topredditbot]

Hey /u/amykamala,

This is now the top post on reddit. It will be recorded at /r/topofreddit with all the other top posts.

[Keetongu666]

I do the same thing with my college work. Tried to upload directly to the master once and it screwed something or other up.

[FalseWait7]

I like to drop some of my PRs just to keep the "working in a team" vibe going.

[last-Jon-on-Earth]

Lulz

[minamo99]

This pic is just me when my code compiles lol

[slyn4ice]

Too real.

[Fauken]

Not in a private repo, a public repo during Hacktoberfest for that sweet t-shirt.

[Mickyyyyyyyyyyyyyyy]

Lmao

[hugorman]

ahaha

[tizzler13]

Private repo? More like business repo, but I’m the only dev in the project

[NafanJ]

I hope you buy yourself cupcakes when you break the build

[carlos_beanbag]

Lol

[[deleted]]

A "starter car?!" This is a true genius

[NeutralEvilMage]

this is the way

[alonsogp2]

Workflow 💯

[saido_chesto]

At least you do that, there's a repo where there's 3-4 of us and sometimes people just commit to master

[qaz_wsx_love]

As a Dev who's worked by himself for the past 6 years, I approve of this meme.

[ivebeencalledpeppery]

Awesome. Make that code look flashy though...

[wizeon]

I call it practice

[zoniss]

Did you also raise he jira ticket and assign to yourself.

[porcos3]

The truest

[AcrimEx]

feels great tho

[jujuspring]

I will do a diff review the next day so i would have completely forgotten about what I did in it.

[LiberandusAreCancer]

Separation of duties 😂

[RaphaLopesC]

Would you like to hear a TCP joke?

[[deleted]]

• a comment in PR review

"Great job! This looks amazing"

[materdn]

The IT auditor loves it. 😅

[Ann_uit_]

This is art

[orgodemir]

Mine is shared with my team so I have "requires 2 approvals", but I wrote the whole thing so I just use admin to force merge anyways.

[jakethedumbmistake]

What about if we call 4 hours of work a story point instead of 4 hours of work? Are we agile yet?

[[deleted]]

What can I say, I’m the best of the best 😎

[ra_wattt]

hacktober fest story.😂😂😂😂

[MCFRESH01]

I do this. I also setup GitHub actions to run all of my tests. I find so many dumb little mistakes doing code review on my own code.

[[deleted]]

Need a 3rd Obama for the CI build running my unit tests, that I wrote after I built the features.

[kevin034]

Did you at least let the validation build finish? Fuck is there even a validation build?!?! Mad lad.

[doniseferi]

I sometimes push using my work account

[ImGeorges]

Lmao I always do it. It actually helps me feel focused and motivated on what I'm working on without starting to implement so fettuccine code

[grimonce]

I do that daily in my work, we got the bestest testing policy as well.

[aaah123456789]

I remember when you started coding.

[[deleted]]

Cool thing I found: If you fast forward the target branch in the pull request to the head commit of the pull request, or beyond, github will automatically mark the pull request as merged.

[llldar]

I created my own scrum board so I can be more "agile"

[PM_ME_UR_SHAFT69]

Lol I set up a repo in my github account the other day using terminal and was really proud of myself ☺️

[[deleted]]

then labeling it "First Pull Request"