"Whenever I see a door that says push I pull first to prevent conflicts"

It's a merge conflict

Me and my wife are software engineers
Started dating while doing a project together
I guess you could say that we...
MERGED WITHOUT CONFLICTS

We all know that guy that resolve all the conflicts with a "push --force"

Push your commits before anyone else, so you don't have to resolve any merge conflicts 😈

The best part of having lazy collaborators is that you never encounter merge conflicts.

Thank you dear mr. boss for fucking up our master branch by adding local changes to a 2 months outdated master branch (250 FUCKING COMMITS BEHIND), pull the remote and then just push without resolving any conflicts!!!1!!!

But thank you so much for sending me an email at 10pm asking me to resolve the conflicts.

It is 3 in the morning and it took 1 hour to get it clean.

Sometimes I want to break some necks...

Whenever I see a door that says "push", I always pull first, to avoid conflicts.

Things I wish I could tell my 18 year old self.

1) Accept you will make mistakes.
2) Truly learn the language you are using.
3) Write idiomatic code for the language you are using.
4) Be upfront about not knowing something.
5) Don't let not knowing something stop you from learning it.
6) None of us knew X until we learned it.
7) Understand your strengths and weaknesses as a developer, play to them.
8) Be willing to try new things.
9) X language isn't ALWAYS the best choice, X paradigm isn't ALWAYS the best choice. Choose wisely.
10) You won't know everything, but you might know more than others.
11) Your ideas and ego don't matter more than ensuring the product works.
12) "Perfection is the enemy of the good [enough]" - Voltaire
13) "Perfection is not achieved when there's nothing more to add, but when there's nothing more to remove." - Einstein.
14) Conflicts happen, deal with it.
15) Develop a toolset and really learn them.
16) Try new tools, they may prove better than what you were using.
17) Don't manage your own memory unless you absolutely have to, you are probably not smarter than the collective intelligence of the team that built the various garbage collection methods.
18) People can be dicks, especially online.
19) If you are new and people are being dicks to you, did you skip past the irc message about etiquette? If you did, you're the dick in this situation.
20) It can be tough, but it is fun, so have fun!

Whenever I see a door that says push, I pull first to prevent conflicts.

"Git pull a day keep the conflicts away"

!rant
!!git

Who here uses `master` for development?

My boss (api guy) tried to convince me that was normal practice. I gently told him that it sounded crazy and very very bad.

Here's the dev path I'm enforcing on my repos:

(feature branches) -> dev -> qa* -> master -> production*

*: the build server auto-pulls from these branches, and pushes any passing builds to staging/production.

Everyone works on their own feature branches, and when they're happy with their work, they merge it into `dev`. `dev`, therefore, is for feature integration testing. After everything is working well on `dev`, it gets merged into `qa` for the testers to fawn over and beat with sticks. Anything that passes QA gets merged into `master`, where it sits until we're ready to release it. When that time comes (it's usually right away, but not always), `master` gets merged into `production`.

This way, `master` is always stable and contains the newest code, so it's perfect for forking/etc. Is this standard practice, or should I be doing something different?

Also, api guy encourages something he calls "running a racetrack" -- each dev has their own branch (their initials) and they push to that throughout the day. everyone else pulls from it regularly and pushes to their own branch. When anyone's happy with their code, they push from their (updated) branch to `qa` (I insisted on `dev` instead.)

Supposedly this drastically reduces the number of merge conflicts when pushing to an upstream branch due to having a more recent ancestor node?

I don't quite follow that, but it seems to me that merging/pushing throughout the day would just make them happen sooner? idk.

What are your thoughts?

Me after a large Git merge, after expecting masses of merge conflicts and getting none. Life is good my friend.

Yesterday was Friday the 13th, so here is a list of my worst dev nightmares without order of significance:

1) Dealing with multithreaded code, especially on Android

2) Javascript callback hell

3) Dependency hell, especially in Python

4) Segfaults

5) Memory Leaks

6) git conflicts

7) Crazy regexes and string manipulations

8) css. Fuck css.

9) not knowing jack shit about something but expected by others to
produce a result with it.

10) 3+ hours of debugging with no success

Post yours

When I see a door that has a sign saying "push" I pull first to avoid conflicts

Coworker: You've merged the wrong PR. It is broken.
Me: is it marked as broken? Is there a mail marking it as broken?
Coworker: yes. I wrote something in the chat.

Me: 🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕

I do NOT read and click every brain fart from the chat. I had the PR (as reviewer and dependent developer) open on my desk and waited for the coworker to fix his merge conflicts.

OK then, try to revert. Git reset hard. Push -f. Policy does not allow master modification. 🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕🖕

Fuck this company. Fuck the policies. Fuck them all with a chainsaw. Forced me to work 2 weeks more. 17.04 should have been my last day at this circus. Let 3 other guys go to vacation while I have fix their management's mistakes. Fuck. You. All. Eat shit and suffocate in piss.

Whenever I see a sign that says 'push', I always pull first, to avoid conflicts.

Fell like I can finally vent this now I've calmed down.

Me: You've fucked the tree again
Junior: No I haven't
Me: It says there "Fixing merge conflicts"
Junior: Well it wasn't me I wouldn't have done a merge
Me: It has your name next to it...
Junior: Well that commit wasn't there a second ago
Me: it's dated for Friday...
Junior: Well if you hadn't committed to master and blah blah blah
Me: We'll if you knew know to use git we wouldn't have this problem.

Me: So how do you handle conflict
Candidate: I use git kraken to highlight my conflicts and walk through them one by one

Probably the most developer answer i've ever heard hahaha

- Merging 300 files from one branch to another in TFS.
- No merge conflicts.

My first thought:
This can't be right. I must have done something wrong...

My git merges are like my social life.

Lots of conflicts and it just doesn't go well

Resolving merge conflicts feels like defusing a bomb.

Had a fun little conversation with a potential employer...

Him: We use git for version control. To work with our team you'll be expected to do the same and be proficient at it.

Me: Not a problem. I am well versed with all things git! May I ask, what does your work flow look like?

Him: All of our source lives in a single repo and everyone commits straight to master.

Me: 😐...

Him: Conflicts will not be tolerated.

What your file looks like when it has merge conflicts:

git commit at 5.50 pm
The winner doesn't have to worry about merge conflicts

So this bunch of idiots made this huge iOS app using lots of global variables, lots of spaghetti code and basically no separation between logic and UI.
Another bunch of idiots were told to take that iOS app and basically port it to Android. And they ported that same code mess, almost line by line, and adding some weird shit.
Now the HQ of the first bunch of idiots realize that the second bunch of idiots were too slow/inefficient/whatever, and they're now asking US to solve that Android mess and add another shitload of features.
The worst part of it, is that both bunches of idiots are still working on it, so we're basically forced to follow the same shitty style until the first deadline, otherwise we'd die suffocated by stinky merge conflicts. Which will happen anyway because our changes are going to overlap.
Oh, and the PM refuses to understand the disaster coming and there's six hours of time zone difference.

Fuck this shit.

Resolving huge merge conflicts...

!rant

Just pushed commit #512 today.
Was a huge refactoring effort which went sooooo smoothly <3
Pull from parent branch without merge conflicts <33
No issues with deployment <333
AND i'm now on vacation 🏳️‍🌈❤️🏳️‍🌈❤️🏳️‍🌈
Things are perfect

What do you guys think of my setup?

What keeps me up at night?
Unresolved merge conflicts.

Best : learning git

Worst : couldn't solve merge conflicts in git

Holy shit balls it works (so far)

-
So I’ve been working on a project... well feature for the past year (yes 12 whole fucking months - anti agile I know)
And today I got to merge that bitch of a pull request into the current working branch and deploy it to UAT - no conflicts 😵I think I need to put the lottery on tonight!
And some how, by some stupid lucky roll of the dice it just works.

I have never felt so afraid and delighted in my life!

When you are working on a feature and someone else is working on the same thing and you commit at the same time and now you have to resolve conflicts but both versions work

I wish there is such thing as branch in a relationship. So that whenever a couple are having a fight, they can create a branch and work their shit out in that branch and eventually merge to the master branch.

Wait
Merge....
That just costs.... more conflicts

Merge Man!

The power to git merge without conflicts.

Get assigned ticket.
Finish the most of the feature. Finish most of the specs.
Push.

Second dev wants to own accounting half of the ticket.
Rip out half my changes, rewrite specs.
Push.

Code review asks for minor changes.
Finish them.
Push.

Product creep creeps the scope.
Finish the feature again.
Push.

Product creep creep-creeps the scope.
Finish the feature again.
Push.

New release happens.
Merge in master; fix conflicts. Run specs; random unrelated specs fail, some fail intermittently. Rabbit holes of complicated, unexplored, obviously-flawed code.
Fuck that. Push.

Internal Microsoft conflicts 😂

When you haven't pulled from master in a week or two and then you do and there's no conflict with the big set of changes you're working on

I got a new laptop today, it only had internet explorer so I used it and it's actually not that bad at downloading other browsers (ಠ ͜ʖಠ)

First I wanna say how grateful I am that devRant exists, because my friends either don’t understand this vocab or don’t care lol.

Last week I worked on a pretty large ticket, opened a PR with 54 file changes. Just to follow standards I set the PR milestone to a future release version, but the truth is I didn’t care which version this work ended up in— I just needed it to go into the develop branch asap.

Since it was a large PR there was some expected discussion that prolonged its merging, but in the meantime I started a second branch that depended on some of the work from this branch. I set the new branch’s upstream to develop, fully expecting my PR to merge into develop, since that’s what I set the PR base to.

I completed all the work I could in the new branch, and got two colleagues to approve the initial PR so it would be merged into develop, I could add the finishing touch and get this work done seamlessly before the week was over. They approved, it got merged, I pulled develop, and… my work wasn’t there. I went to look at my PR and someone had changed the base branch to a release branch. It was my boss, who thought he was helping. (Our bosses don’t actually work on the same team as us, so he didn’t know. it’s weird. We have leads that keep track of our work instead.)

I messaged him and told him I really needed this in develop, knowing our release branch won’t be in develop for probably another week. I was very annoyed but didn’t wanna make him feel too bad so I said I’d just merge the release branch into my new branch. So many conflicts I couldn’t see straight. His response was “yeah and you’ll probably have a bunch of package manager conflicts too because that’s in that release.” He was right— I have so many package manager conflicts that I can’t even see how many compiler conflicts there are. I considered cherry picking my changes, but the whole reason I set develop as my upstream was to avoid having any conflicts since I’m working in the same functions, and this would create more.

So I could spend the next (?) days making educated guesses on possibly a thousand conflict resolutions, or I can revert my release branch merge and quietly step back and wait for the release branch to be merged into develop.

I’m sure cherry picking is the best option here but I’m genuinely too annoyed lol, and fortunately my team does not care to notice if I step back and work on something else to kill time until it’s fixed automatically. But I’m still in dire need of a rant because my entire plan was ruined by a well-meaning person who messed with my PR without asking, so here is that rant and I thank you for your time.

When I see a door with a push sign, I pull first to avoid conflicts

When I know that i 'm working on the same file with someone from my team, I do my best to commit first so he 'll be the one resolving conflicts :D

Sometimes the worst part about being a dev is:

*git push*

"There are 27 unresolved merge conflicts"

Greetings from Denmark! Thought I would join after a lot of lurking, and tell a little story, as to how I fucked up when I started in my company.

I've been there around 10 days and had never used git besides just add, commit, and push. I was told to work in feature branches, and I did, I was playing around trying to learn, and got some merge conflicts, made a lot of unnecessary commits etc. I was told to clean it up before I merged into dev. And as I didn't know git I asked how I could do that. I was told I could force push in my branch, and that it was okay as long as it was only inside my branch. I tried that and saw my command line force pushing to all branches including dev, and master. My heart skipped a couple of beats, and I went directly to my Lead developer and asked what happend. He got a bit mad at me for pushing in dev and master, and override all the commits there had been made. I tried to explain I didn't he did not really believe me, I was so nervous. Luckily everything came back to normal with people's local branches being pushed etc. But that day I learned about git's push matching config, and my lead was luckily only mad in the heat of the moment and even apologized for getting mad. Just one of my little fuck up's in my short time as a developer

When you go to merge and there's conflicts.

Hey boss, I see you are on a rampage with those trello cards, they all flying to the done list... How about you push to gitlab at least once a week too?

You gonna have to deal with the conflicts alone you dumb fuck :)

Slack Boss: hey, could you check work of dev that is okey, we want this update fast.

Me: hey, just tell him to open PR and assign me, I will check and merge changes.

Slack notification: Dev: Hey, could you please merge Pull request on the project ?

Me thinking, hmm weird, I didn't get email.
Checking github, 0 pull request.

Me: hey, I don't see any pull request open, and when you make pr, just assign me I will merge it right away.

Dev: takes half a day

Dev: Makes pr and assign correctly me.

Dev on slack: HERE is PR open now @me.

I get 3 notification to see this PR, sure at least it is there.

I check this PR, 50 commits, X conflicts, cannot merge this.

Me: Hey, @dev please fix conflicts in your PR.

DEV: takes another 2 days to respond.

Boss in the meantime: hey, have you pushed those new changes ?
Me: I am waiting for conflicts to resolve.

Dev: I fixed the conflicts @me.
I check the PR conflicts are there.

Me: are you sure you pushed your changes @dev ? I don't see them resolved

Dev: takes another day and pushes changes to resolve conflicts.

Me: merges PR to master becaus he based it on master, I will sync the developer branch myself.

All good, everybody happy.

I write to dev: Next time base your changes on develop branch and resolve conflicts before making PR.

Two weeks later new PR From this dev.

Based on Master, conflicts everywhere.

Worst thing in IT you can do is pretend to know what you’re doing when you don’t.

All seems harmless until that person starts resolving git conflicts….. 💣💥

The senior programmer at work commits so rarely that in 3 months I committed more than him in 3 years (e.g. 0 times in September)...

What’s the point of having a repo on bitbucket if most of the time the latest code version is only on his machine?
And why I have to recreate and repopulate the db every fucking time because he made so many changes to the structure, which of course conflicts with mine?

Today I was talking about merge conflicts with a group of devs. One of them asked if any of us had ever rushed to merge a PR before another dev could merge their PR, knowing there were going to be conflicts. Some were more ashamed to admit it than others, but in the end everyone was guilty of doing it at least once :)

Anyone ever do that to avoid being the one who has to resolve a conflict?

Ran couple of interviews today I don't think I'm ever gonna forget this guy: He was explaining a time he worked in a team and used version control. I asked how he handled merge conflicts his response:
'If there are merge conflicts I delete their work and use mine, my code is probably better anyway'.

!dev

my boss is apparently upset that i don't turn his way when he enters the room, something about hierarchy and respecting authority. while that's a petty bs thing to be upset about, I'm not very good with social cues and conflicts with authority figures trigger me due to past events.

I can't help wonder if this demand for a show of respect is gender biased. it hasn't escaped me that all the people he has an issue with are women and he has a history of chasing his female workers away.

idk, i just don't want to do this shit again. it would really help to have a female perspective on this.

Please, stop being afraid of git rebase.

Please stop merging master branch into feature branch just to fix pull request conflicts.

Finished my project early today. I assumed it would take another day or two since it's primarily research and I had no idea how to progress, but I caught a break and finished it early. I also finished another surprise ticket! yay! I had the rest of the day to myself!

... had!

But then I noticed I had been working on the wrong branch. Fuck. Moving my work over was tedious, as was the cleanup. I kicked myself for good measure. Also, every time I switch branches, I need to run a bloody slow script that runs all the migrations, data tasks, backfills, etc. for the branch. It takes 12-18 minutes. There's a faster version, but it usually breaks things.

Turns out the branch I was supposed to be working on wasn't up to date with master. So I merged that in, leading to....

merge conflicts. Because of course there are conflicts. To make matters worse, I had (and have) no idea which changes were correct because idfk what those 248 new commits are doing. So I guessed at them, ran the script, and (after more waiting) ran a few related specs. Yet more waiting. Sense a pattern here? Eventually they finished, and all the specs passed. H'ray. So I committed the changes, and told Jenkins to kick off a full spec suite, which takes 45+ minutes.

La de da, I go back to cleaning up the previous ticket, pushing reversion commits, etc. Later, I notice the ticket number, look at the branch number I've been working on.... and. Fuuuck. I realize I had put everything on the wrong freaking branch AGAIN. I'm such an idiot. Cue more cleanup, more reversions, running the bloody script again and again. More wasted time, more kicking. ugh.

All of this took well over three hours. So instead of finishing at a leisurely 5:00 like a normal person, I finally stopped around 9pm. and I won't know the Jenkins spec results until morning.

A nice early day?
I should know better.

forgetting to fix your conflict before production :) technopolis.bg

I had a nightmare once about git commits and merge conflicts.

Ready to finally deploy and... merge conflict :/

The year is 2019.

C++ is still one of the most powerful programming languages around..............with no centralized package manager that is widely adopted by the community that allows one to sandbox libraries from conflicts with one another.

I ain't hating, just find this funny and I love cpp

Apt get/git submodules it is!!

Merge conflicts in git I guess 😄

Wow there are conflicts, please git merge first

Not usually a person to rant about spacing and conventions but this is great.

4 devs, all using IntelliJ. Now IntelliJ auto-changes tabs to spaces which is nice, and GitHub doesn’t really care as long as the spacing is consistent. Now here is the fun part: 2 devs have 4 spaces per tab, 1 has 3 spaces, 1 has 5 spaces.
GitHub merge conflicts everyWHERE.

And yes it isn’t the old 2 vs 4 spaces. It’s 3 vs 4 vs 5 somehow

"When i see a door with a push sign, i pull first to avoid conflicts !!!"

git pull... FFS! Conflicts?!!

Outlook must have a different meeting in mind than the one I will be attending tomorrow ¯\_(ツ)_/¯

>Installs NodeJS (from default Debian repo)
>Tries to install yarn
>Yarn tries to uninstall nodejs

Weird
>apt-cache depends yarn
yarn
Recommends: nodejs
Conflicts: nodejs

10/10, gave me a good chuckle. Time to add the NodeJS repo.

Summary of my week

Day:
Fix merge conflicts at work

Night:
Fix merge conflicts in Skyrim mod scripts

Those pesky merge conflicts

Unresolvable merge conflicts

Tunes throughout the work day...

Someone's interrupting:
Queen, Don't Stop Me Now

Working on same bug for hours:
Muse, Supermassive Black Hole

Merge Conflicts:
Jay Z, 99 problems

In the zone coding:
xzibit, Concentrate

All bugs squashed, deployed, going home:
Louis Armstrong, What a Wonderful World

> make a merge request
> it gets reviewed one month later
> "I can't accept it there's too many conflicts"

Well wouldn't you say that, maybe next time try accepting the MR when I make it and see how that goes

Treat yourself to an early weekend

I can't get the wifi generation. I love cables (except when they are in front of the tv), their performance, their plug-n-play without conflicts, that high level of nerdy childish porn of 80's in all the magnificence. It's just me? *snowflake feelings*

I experienced merge conflicts for the first time.

I. Hate. Them.

Other Dev: I worked really hard over the weekend to get the issue fixed, I raised a PR but it has a zillion merge conflicts. Would you mind taking a look at it?

Me: Ok. *Changes base branch away from Master.*

Other Dev: Whoa! How’d you fix them that so fast???

Me: Experience.

Really thought Facebook changed the messenger icon. This smells of spam and paid reviews. I thought Google was working on trying to combat obvious name conflicts and spam.

git push origin stupid-long-feature-name
git pull origin develop
*Checks through all changes. No major conflicts. Accepts changes.*
npm test
*4 failing tests, none of them in pieces that I touched for my feature.*
*That's funny. QA was loaded from the develop branch, and everything works.*
*Actual data has dates from today. Expected data has dates from a week ago.*
*examines tests*
Why are all these expected dates hard-coded‽

tl;dr The external development team committed 4 tests that would only ever pass on the day they were written.

Look at that. The very fucking smart colleague spent 40 days implementing a repository pattern (WHEN WE'RE USING AN ACTIVE RECORD ORM), breaking stuff left and right. Does he use that fucking pattern at the very least?

Of course he doesn't. And along the way he's making sure to create conflicts with the stuff he broke (and I'm fixing). By the time I fix the merge conflicts of one commit, he pushed 6 of them.

How would you handle a noob who hasn't committed in weeks and when he does, gets like a million conflicts.

When some one at the company decides to branch off from the main codebase and end up with several outdated and separetely modified branches for two years.

Yeah nice work genius and good luck with resolving over 250 files of merge conflicts.

Just kill me now 😭

It is time... to rant about macs!

No, seriously - I had such a different experience about which not many talk in real life or pretend that it never happens....

Model: 2015 mid MBP 15" with second to highest specs (don't have dedicated gpu).

Rattling fucking toy.... Yea, it rattles! If you shake/move ir sit in trait/bus - it non-stop rattles as a fucking toy. Worst part? It's confirmed issue by apple and it manifacturing issue that they are not keen on fixing!!!! WTF? We have 4 macs in our office - all of them fucking rattles... God help me how annoying that is. (Lose LCD control panel that unsticks from glue. Replacing it solves the issue for 1 month if you carry it anywhere).

Constant fucking crashing/updates.... Every morning I wake up and don't have an app that requires confirmation for restart - it's restarted. YAY, turning on all apps once again.... Why you may ask? Well, because if you tinker with software in any way - it fails to update it and hell breaks lose. It's been a long time since High-Sierra came around and the issue is still there (not running Mojave as it conflicts with soft I have... Woo!). Tried few times - updates fail. Resolution? Reinstall OS!

OS conflicts with applications - damn... People told me it works out of the box.... Yeah, as long as you don't upgrade the OS - then it breaks. Why? Well, because.

Piece of shit power supply. With 4 of our office power supplies - 2 of them failed twice withing warranty and once afterwards... Really? Not to mention that all 4 are starting to shear the sleeve or already did (mine is just wrapped with white electrical tape to give it a support... lol).

Bluetooth - who the hell needs that in mac, right? Well, people do. To start with - it conflicts with 2.4GHz wireless network - you might have one of those and not both at the same time. Next thing is using a device that needs constant connection (mouse, headphones, keyboard - non apple branded) - shit... They can't stay connected for more than an hour without any issues... Constant battle to re-connect it, to re-pair the device and all due to smart apple bluetooth settings. Hell, my mouse (logitech MX master) was even printing random symbols in some applications if moved. All of the issues went away after using a bluetooth dongle... WOO!!!!

Xcode... Ahh, you may never prepare your mac if you don't download 17GB of fucking xCode libraries that enables some tools to be installed/runned as you can NOT get them in any other way and you have to install full xCode software in order to get them... YAY! 17GB wasted on my 256GB SSD that I can't upgrade. GREAT!

OsX applications - ah, don't get offended but if you are using them and you are fine with them - you are probably a monkey that loves being told what to do. You can't customise any actions, you can't configure it the way you like - either you accept their default workflow or go kill yourself. Yep... Had issues with calendar, mail, iMessages, safari... None of them fit my needs :)

Resolution scaling... Fucking hell, the display is 2880 x 1800 but all you let me to use is 1440x900 without scaling? Am I blind to you? Scaling the resolution means that you are fucked if some applications don't support scaling very well. Looking at you Jetbrains - your IDES suck at scaling and slows down the pc to a potato....

Now the pros - keyboard is way better than the new ones, trackpad is GREAT - no need for mouse (using it on external 4k displays only), the battery life is great - getting around 6h of continues development time, 8 if using sublime instead of phpStorm and well, that's about it...

To clarify:
I've bought this device due to the fact that at that time mac and windows pc's with similiar specs costed the same while windows pc sucked with their quality of the device and trackpad... Now the situation is better and when time comes for a next upgrade - it's going to be one of these:
Razer Blade 15, Dell XPS 15, Lenovo Carbon X1 series.
And of course - LINUX. I've had enough issues with windows, and had enough of retardness of apple ecosystem, so switching it is a must for me.

Disclaimer: I might be an unhappy customer, a bit picky but I'd like my device to be setted up as I like and continue to have that until I don't like, not until the company decides to break it. Not to mention that paying almost a yearly salary in my country for one device - I'd expect it to be at least reliable and work without issues....

Rant over.

ps. You can disagree with me, this is my personal experience with MBP over the last 3 years :)

When you upstream your android kernel without any merge conflicts

new git alias :
mergetool : rm -rf .
just delete all conflicts in code

I did a fucking huge mistake.. didn’t update arch for too long..

What a fucking pain in the ass to solve those package conflicts..

From now on, I’ll update EVERY FUCKING FRIDAY...

Current work project: Ok where is the master branch?
Coworker: Oh we lost that one a few months ago due to some merge conflicts...

I wish my classmates didn’t know that I’m good at programming.

Recently, more and more often I am being reached out to by my classmates (and especially by one individual) about the problems they’re having issues with. For example yesterday, a guy fucked up his Git commit and made a bunch of merge conflicts, so I helped him fix this, which then lead to WinForms having multiple declarations of same objects.

And I really don’t wanna be rude, and I always try to help, for the love of god - stop bothering me every 5 minutes while I code, or at 10 PM while I wanna chill out.

Most of the things they have problems with can be solved by 2 minute Googling and I strongly believe that at the university level, you should be able to find solutions for your problems yourself - especially when you’re a programmer.

Someone just overwrote 2 weeks of work in SVN because they don't understand merging.

When they did an update before committing they ignored the conflicts and tried to build their work.

But wait it won't build if their are conflicts, I know I'll just copy this backup over the checkout and check that in instead.

It took me over an hour tho fix this fucktard's mistake and I still don't think they understand what they did wrong. Their supposed to have 40+ years of experience.

In the end it turned out they wanted to change about 10 lines. They had checked in files that they didn't even change, they were just out of date compared to trunk.

I panic like I'm fucking drowning when going through git merge conflicts via command line

My coworker became super restless and incompetent during the initial 2020 Covid lockdown. Like playing hours of video games during work hours restless.

For one project, my coworker was working on the backend and I was working frontend. Coworker also wanted to be overlord of the epic branch.

My coworker merges the epic to our test branch and our code is broken. Coworker didn’t pull my FE changes before merging. Dude, I shouldn’t have needed to tell you to pull. You changed the api response that your BE code delivers so of course I had to update my FE code so it could work with this change.

I had to resolve the conflicts because coworker left work early to “rescue/pickup” their girlfriend from work.

You bet I leave this person on read when they try to text me on Signal

More work-related than dev-related:
- Saying "yes" to extra work more often than necessary.
- Wanting to do everything myself and not delegating enough.
- Getting too stressed out.
- Avoiding conflicts and confrontations (even necessary ones!) and not being assertive enough.
- Overthinking everything.

When a co-worker casually tells another co-worker "We're going to have so many merge conflicts"

Have you ever been this frustrated?

when you have a ton of bugs to resolve and short deadline to catch and suddenly you get infinite git conflicts because of your co-worker's stupidity..

I just broke out of merge-hell.... It was a mere 2 and a half hours... But my migraine says it was eternity.... 😶

On today's episode of "Being the Company Git Guy":

"Good Day jallman112, can you ping me when you have a second? I'm having issues with merging our last branch back to MASTER in GIT. It's forcing me to resolve 400+ conflicts"

Sure. I'll get right back to you.

In a second.

Promise.

From a Dev at my old place: Don't use git for such a small project, I think we should use email to send our code to each other.
Turned out that this "small project" was a piece for a larger project.

Also turns out there's such a thing as merge conflicts outside of git.
Our code was broken for 3 days once because of his shitty advice.

Yesterday I had to merge new features. As these have been developed by one developer, I thought "hey, that'll be no problem". Little did I know that every one of the 6 branches had merge conflicts *sigh*. These merge conflicts were so severe, that there where sometimes two methods in the same class with the same name doing different stuff in each branch... Normally I would tell her to fix her stuff but as she is on vacation right now, I had all the fun resolving the conflicts of code I hadn't written and repairing the failing unit tests she wrote.

The best thing is that our software will be featured in one of the most renowned business magazines at the end of the week while simultaneously being presented at a congress in Berlin in front of over thousand of potential new customers. So these knew features have to be running stable in production by then... Needless to say I had a great day yesterday and will have an amazing upcoming week 🎉

Fuck me and fuck merges and fuck conflicts!!!

I still love you Git but sometimes you are a harsh mistress.

Today is a great day ! Deadline is tomorrow, fixed all the issues, looks like everything works...

...

CONFLICT (content): Merge conflict in xyz
CONFLICT (content): Merge conflict in abc
CONFLICT.....
...
Automatic merging failed; fix conflicts and then commit the result.

I hate my life :)

Merge conflicts are such a pain in the ass 😥

There is this project where the develop branch is "discontinued" because this moron "finished" a feature that is all fucking broken and I could not figure out how to solve all those merge conflicts...

I just gave up and told my stupid boss who just nods and laughs at everything... If it ever comes up I'm gonna tell them to get the fucker to solve it.

What happens when you don't properly review git conflicts:

Me:
* Builds Project and Hosts it *
* thinking * : * ' I don't really need to push to Master, I'll just push it to the deployed branch *

Me: * tests project from host *

Me: * sees a bug, fixes it and rebuilds the project, hosts it and pushes code to deployed branch *

4Hrs Later:

Colleague: Dude did you see the Typos you made? Fix them!

Me: In my defence, I wrote this at 4am in the morning, did not sleep for 2 days.

Colleague: Don't Care, fix it.

Me: *Creates Hotfix Branch from Master*
* INSTALLS DEPENDANCIES AND FINDS OUT A NEW VERSION IS OUT AND UPDATES THAT AS WELL *
* Runs Project and finds out it's not the hosted version. *
* Merges Deployed Brunch to Hotfix Brunch and this happens *

Error Message: Unexpected token

620 Merge Conflicts

🤦🏽‍♂️🤦🏽‍♂️🤦🏽‍♂️

Do any other devs here have serious entrepreneurial ambitions and the drive to achieve them?

How do you manage the conflict between your day job and your ambitions.

I find every employer is looking for someone with just enough ambition to “move up” in their company but any ambition of your own outside that seems to come off as threatening.

I try to keep the 2 separate but I have always thought that by not wanting people with actual ambition a company is only hurting themselves.

Thoughts?

Merge VS Rebase:
- Did you pick a side?
- Practical tips? Like dealing with merge conflicts
- Have you ever regretted using either?

My answer
* My team squash-merges all branches to master so we don't really care what the branch history looks like. Master history should be pretty - but a branch history can be ugly and filled with a dozen commits.
* Practical tip 1: use `git config rerere.enabled true`. rerere stands for "reuse recorded resolution" and this means if you rebase often you don't have to resolve the same merge conflict twice.
* Practical tip 2: use `git commit --fixup oldcommithash` and then rebase with `--autosquash`
* I like using Rebase. But I have regretted the amount of time I've spent on trying to rebase old branches with many commits only to give up and to `git rebase --abort` since I realised I couldn't handle trying to reapply all the commits chronogically as the changes in the 1st commit were no longer relevant.

Conflicts, conflicts everywhere.

Recently I've started thinking about how we are always told "No you can't do that" to everything. That feels like a theme in our industry.

I've also been thinking about how often people say well done to each other, or just comment that something is good in a pull request. Everything is always focused on bugs and mistakes - not good bits.

The first point conflicts with the idea that when using languages and frameworks you should follow their philosophy or you're gonna have a bad time - but in all other instances you mostly don't have wrong answers, just answers that can be better so a lot of stuff is opinion based.

I've decided to change my ways and focus just as much on good stuff as bad when I review code and to make sure I'm focusing just as much, if not more, when people do something good.

I think I do a good job, but I don't think I've been told I'm doing a good job or that anything specific is good more than a couple times in the last year - mostly in mandatory reviews. What about you?

Is “highly skilled at resolving conflicts” something I can put on my resume?

We're having a mini-hackathon at our school last Saturday as a final exam of our Web Engineering course, showcasing what we learned throughout. The theme is all about helping university students gain their productivity and improve their interaction with technology.

Me and my team tried to create a note-sharing platform for students. We loved the idea and we're so excited to create it. But excitement turned into shit hole during development.

A fuckton of merge conflicts, divisive code conventions, and usage of god-awful Bootstrap for front-end came in. 😱😬😣

Despite these things, we are able to win the hackathon (i still can't believe we won). but he worst part of winning is that the prize is not cash nor the internship (the judges are from the company who somehow looks for interns), but fucking useless GIFT CARDS!!

But in the end, we're proud of it. I thought that it will be just a concept but in the end, it became real and it turned out to be great. ☺

The one skill I know that I am really proud of is GIT.

Put me into trouble with merge conflicts.
Saved my life with its version control.
Always had an adventurous ride with Git. Hope to have many more such rides and get to learn more about you.

INTELLIJ YOU PIECE OF SH*T, I CLICKED "SMART CHECKOUT" NOT MERGE 2 UNRELATED BRANCHES, SCREW UP MY MASTER AND DON'T LET ME RETURN UNTIL I FIX ALL MERGE CONFLICTS.

99 problems but a conflict ain't one

That moment you have a designer fix something on the project you working on and pushes conflicts to your repository..

Python, where every 'import' feels like summoning an ancient deity, praying that it won't bring a parade of compatibility issues and version conflicts.

Trying to resolve merge conflicts and you cant remember which changes are the ones you want to keep. Lesson learned, make sure your pull requests dont sit waiting for weeks while master is happily being worked on.

My killer PR:
I made a small feature and it was to be merged in my senior's branch.
So I made it, resolved all the conflicts and when it got merged it broke my senior's branch.
This is nothing new and it happens, so me and him sat down and got it working. After two days, his branch got merged and broke it's parent 😂, after investigation my code was the reason, got fixed and merged.
Same thing happened 3 more times, and every time my code was the culprit.
Now for staging we thoroughly tested everything and deployed it, after running for 2 hours the piece of shit broke again 😂😂😂.
A meeting was arranged for scolding the team, and after the meeting the architect comes to me and say "how did you manage to fuck things on so many levels, literally?". I handled it like a pro with an awkward laugh.

We exhaustively checked it for production. Deployed, it did not broke, we were happy. After a month of successful run, I just joked about the above incident while we were working on next release on morning coffee. That cursed thing broke on the same evening. I was like 😮

*working at a project, currently creating commits and pushing to remote

I created an early PR with a title [UNFINISHED] and [NOT YET DONE]. I'm really not finished yet. lots of stuff still need to be committed and pushed to repo

And suddenly, I find out that my team mate - just out of the blue without any prior warning - MERGES THE PULL REQUEST

"oh hey there are conflicts in the pr you made"

YEAH WELL MAYBE TRY GETTING YOUR HEAD OUT OF YOUR ASS WHAT IS WRONG WITH YOU ARE YOU EVEN SANE

So now what happened is half of my commits are merged, he didn't tell me, i pushed more commits, branch recreated, and then he reverts the merge. so now everything is really messed up :)AS)D(F)AEF)SDF)AW)sfdjsigkl;zfghlkkj ghaslkj;gabsd;lkgjabslkfgh GET YOUR HEAD OUT OF YOUR ASS I WANT A PROMOTION

So there is a 50/50 chance I am getting flamed af tomorrow during code review because of my branching/merging actions on thursday and friday... Merge conflicts... We all love them...

Take your time with merge conflicts, and put the entire file in another editor in case you really mess up.

The current project I'm working with had 3 devs including myself until Jan 1st. Now we're only two, because our lead/manager started to work in other projects and trusted us.

Since that happened, my first PR/Commit of the year was in Jan 5, and it's still open, without any kind of review or comment, as well as my other five (eight in about a day) PRs, while he's making commits directly into develop/main branch, causing conflicts everywhere on what I did...

I'm leaving on friday because the contract is ending.

Good luck I guess.

Our development team had a potluck the other day. We made sure everything was accounted for, and we even resolved conflicts!

So my colleagues don't proactively do PR reviews, even when they're assigned to them, unless asked for the n-th time by me or the PM.
In the meantime other PRs get merged, I need to merge master in my branch, and solve conflicts every time so that it is eligible for merging.
Additionally, while reviewing, the requierements engineer realizes that there were corner cases not initially covered in the ticket description, so I get review findings about covering these.

Hey guys, love this app, and the funny devRant cartoons on their YouTube channel 👌

When you offer to help out a fellow coworker on the top priority feature he is developing and he just sends you the branch and stops working on it.

Just merge this pull request in production and all service gonna work fine, trust me :D

Sample Merge Conflict 🤣

I was minding my own business, fixing merge conflicts for my project lead when it struck.
There, in the middle of a React.js component, was a table, used not for displaying data, no, but for styling a form, which was not a form, but a series of table rows.
I feel sick

I spent the whole day on git conflicts, I know it happens sometimes. But I do feel like a slow programmer, the boss even said so by comparing me to someone who has 15 years experience by saying I produce less lines of code than than him ( I have 5 years of experience).

So everyday, I have this nagging thoughts; "you are too slow, you can't even program, what are you doing, do something else this isn't for you etc" .

And then when I solve the problem "You are the best, you know everything etc"

A constant battle between self-destructive and positive thoughts.

Typical Git work flow on a feature branch:

Commit#1 : The silly feature itself that took 10 minutes to code
Commit#2 : Added unsaved files
Commit#3 : Fix unit tests
Commit#4 : Fix
Commit#5 : Fix
Commit#6 : Fix
Commit#7 : Various Fix
Commit#8 : Added unsaved files
Commit#9 : Merge
Commit#10 : Fixed unit tests
Commit#11 : Code Review tasks
Commit#12 : Revert- Code Review tasks
Commit#13: Refactor part 1
Commit#14: Refactor part 2
Commit#15: Deleted unit tests
Commit#16: Added checking for null
Commit#17: Completely different feature's bugfix
Commit#18: Code review spacing corrections
*Approved*

Trying to merge, then merge conflicts.....

I love git stash.

It's helps a lot for doing refactors to me. I guess it's not the most complex workflow, but it wasn't obvious to me when I started with git. Let me explain.

Refactors. As you start writing the first lines of a refactor, you start to notice something: you're changing too many things, your next commit is going to be huge.

That tends to be the very nature of refactors, they usually affect different parts of code.

So, there you are, with a shitload changes, and you figure "hey, I have a better idea, let me first do a smaller cohesive commit (let's call it subcommit) that changes a smaller specific thing, and then I'll continue with the upper parts of the refactor".

Good idea, but you have a shitload of changes nearly touching every file in your working copy, what do you do with these changes? You git stash them.

Let's say you stash and try to do that smaller "subcommit". What sometimes happens to me at this point is that I notice that I could do an even smaller change inside this current "subcommit". So I do the same thing, I git stash and I work on that even smaller thing.

At some point I end up `git stash pop`ing up all these levels. And it it shows that git stash is powerful for this.

* You never lose a single bit of work you did.
* Every commit is clean.
* After every commit you can run tests (automated or manual) to see shit is still working.
* If you don't like some changes that you had git stashed, you can just erase them with git reset --hard.
* If a change overlaps between a stash you're applying and the last "subcommit", then
if they differ, git shows conflicts on the files,
if they are identical, nothing happens.

with this workflow things just flow and you don't need to wipe out all your changes when doing simpler things,
and you don't need to go around creating new branches with temp commits (which results in bloated temp commits and the work of switching branches).

After you finish the refactor, you can decide to squash things with git rebase.

(Note: I don't use git stash pop, because it annoys the fuck out of me when I pop and you I get conflicts, I rather apply and drop)

The day we had to have an app ready for an upcoming demo. Management said everything needed to be done by the end of the day. My change was done, but was dependant on another change being merged first. I had been in the office since 8am. It didnt get merged until 5pm. I was in the office until 8pm trying to fix the insane merge conflicts. In the end i gave up and went home. The next day we discovered that the "deadline" was made up anyway so we still had time. I wanted to flip every single table in that office.

Whenever i see a door with Push sign, I Pull first to avoid conflicts...

The pain of merging the conflicts of code on which you never worked on ... ahhh omfg ..

For fuck’s sake, Git is not SVN. Get over your fucking svn mindsets and learn the damn thing before coming to me to help with your conflicts.

Git, conflicts

Story of my day
<<<<Head
code
=======
my code
>>>>>>>

Had a nasty day

incompetent fucks giving no shit about agreed git flow

merging directly to master
complaining about conflicts and not willing to solve it themselves

Not a fight I was involved in but one I observed. A junior dev on my team and a server ops guy had major personality conflicts. One day the server ops guy had enough and physically went after the junior dev. I was senior but still pretty new to my own career and had no idea how to handle it. Server guy got fired soon after. I was glad I didn’t have firing power and that he didn’t even report to me anyways.

they say everything "old" is better, but in programming, dependencies in C was a mess. Shut up. Sometimes C is a cult enforced by those who don't even write in C. Now I build my projects with Parcel in less than a second with no configuration. It uses a full-blown AST for everything. If I want more performance with similar DX, I use fastpack, bringing build time down to tens of milliseconds.

art? charli xcx, sophie xeon, death grips, just to name a few. they made things that weren't imaginable before, ultimately pushing music forward. Hendrix is good but they're just incomparable in terms of beauty, complexity and sophistication.

literature? every old book I read feature same conflicts. they are so similar it's almost boring to read them. meanwhile, Erlend Loe delivers a complex idea without using a conflict (!) and without any character changes. that's insane.

"older is better" is getting old. it's time for you to seek for some other reusable gibberish to insult what other people create.

finally, let me remind you that you, my friend, create nothing.

Me on getting a huge bunch of merge conflicts!! 😵

Have to follow same coding conventions of colleagues just to avoid merge conflicts.

So, after day 3 of Rust programming I have an observation to make:

Rust package management (and conflicts that arise) is not very good.

To the rusters out there, am I wrong? Is there something to make it better?

I just hate merge conflicts in big PR!

Tldr: I think I made a company fire some dev a year ago.
I was working for this company remotely, alone, on a very big and old legacy php project where they still used echo '<code><code/>'; and i was a very junior junior front end developer, needed to make the website work somehow (whole new design). They brought in a random guy to work with me, and we started working.. I was using bitbucket to version my changes, and I asked him to do the same. He tried pushing his changes once and then practically never again because he started working in files that i was working on and there were git conflicts, and he gave up, even though i asked him to do that... he then statted using general classes to style the page (like .color) with absolute positioning and it broke everything everywhere. He then proceeded to minify half of the php files 'because of performance', I remember talking to other few people in the company and he disappeared a few more days later. I never finished the project because they stopped it randomly and i think i got him fired even though he could've continued working in the company

My "senior developer" colleague just committed 300Mbs worth of node modules in addition to static files bundle. So not only I have to wait 20mins for the changeset to download on this god damned internet over barrels connection but also resolve merge conflicts on 100+ files. You think that was a mistake? Oh no I've asked him about it and it was intentional ...

half of my career has gone into resolving merge conflicts...

Usually, when I programme for myself or in a German-only team and they agree, I/we do it in German because it makes naming things much simpler (no naming conflicts, never, and a strict visible separation between your code and libraries).
This time, I thought: "Nooo, let's do it in English, because, you know, reasons and it fits into the situation"...
Booom, stack overflow!
"How in the hell did that happen?" I never had a stack overflow before outside of recursive programming.
And what was it? I had made a class to encapsulate an API, added a property with getter and setter, naming in English and similar to the said API... very similar... in fact, the property had the same name as the API function, resulting in a getter calling itself over and over again.

This was a harmless mistake, and found very quickly, but it's interesting so see how a habit (or working method) probably prevented similar or worse sources of error in the past.

Okay, seriously, who invented merge conflicts? I want names! It's like playing Jenga with code, hoping your masterpiece doesn't topple over. I've seen more ">>>>>> HEAD" blocks than actual code lately.

Can we all agree to commit more frequently and save my sanity, please?

When you try to merge branches :D

"No merge conflicts, ready to commit."

Such sweet words from TortoiseHg, and it's not even valentine's day!

git rebase > git merge

I'm honestly tired of colleagues completely fucking up the git history along with creating conflicts for no reason at all.
How do you even manage to "recommit" changes when merging?

I can't even squash properly because there are 5 merge commits on the feature branch. Fuck off

today:
Committed my code for Code review
solved 23 Merged Conflicts
Fixed 65 Load project Error.
Fixed another 8 Compiler errors because of mistake made in Merge conflict.

I wanted to do coding today... I really do..

I just love how XCode handles git merge conflicts. Especially in project meta files. ❤️

Just happened today!

So since this morning we've been trying to get our website ready for UAT deployment Monday next week, even though we only were told of it yesterday. Since we had some critical merge conflicts to unscrew on our dev branch for promoting to UAT, we sent a warning to everyone on our hipchat group

Dev team: @all please don't commit anything to the repo for an hour or so while we get the branch good for dev and uat build

Tech lead: ok

That should be enough warning, right? Surely our tech lead, who has been piling up our scope creep trying to please our stakeholders, understands well enough not to do a single goddamn thing on our repo until we sort it out, right?

Nope.

10 minutes later our tech lead pushes several changes that not only break our builds but also remove all our configuration transformations. I just stormed out of the office to avoid sending her on a one-way ticket to slapsville and fuckyoutown. Geez goddamn louise.

Ever tried explaining GitHub to someone? I swear it's like trying to teach a dog to ride a bike. You can try, but it's probably not going to end well.
Okay, rant over. Back to coding... and dealing with merge conflicts... and pull requests... and GitHub issues... sigh.

SQL collation conflicts are the worst thing that has ever been made possible in humanity... it's 1000 times worse than problems with time zones, change my mind.

Fuck off whoever decided to make hundreds of different versions of the same languages.

When you work with people who don't understand git merge conflicts yet...

Since gitkraken is turning into such a bitch, I've searched for alternatives once again, as usual none of the competitors still implemented a fraction of it, after so much time.

Sublime Merge looked promising, but then half the time fucks the history graph, fails to remove remotes and more funny stuff I don't want to mess with.

Github Desktop I didn't even try because it didn't seem to have any proper history graph to begin with.

For now ended up on sourcetree, though I really do miss having commit message and description be two separate inputs, have done the most basic merge for now, so it's a to be continued experience.

Mostly afraid of how it'll show merge conflicts and commit view, as from what I gathered it doesn't fullscreen when you click a commit, but instead shows an awkward small screen at the bottom of the graph split further in half with the avatar and commit message.

Edit: oh for fucks sake, just noticed it doesn't even have linux support, god damn it.

Pretty busy day at work today.. in the midst of everything, a co worker asked me to sync their branch on GitHub since they don't know how to.

Told them to commit any changes do that there wouldn't be any conflicts.

Their response: "you should already have my latest from 2 days ago"

.....
Two questions that I should have asked:

1) what have you been doing for two days?
2) why am I doing everything else?

:\

Situation: I have a love hate relationship with python due to the lack of types as I have in more established languages such as C#, Java and shit even TypeScript

Situation (cont): A rather large codebase that i have developed for multiple processes at work run on Python.

I don't hate it, I just don't absolutely love it, there is a lot of things to like about Python, but man I do have some conflicts with it, I have been facing out to use other solutions that feel scripty, such as the newer versions of C# with .net, but I would say that about 80% of our codebase runs on Python, the rest is PHP.

I am somewhat traditional in the way my programs run, I started with C++ and Java, then for whatever reason (I blame codecademy at the time) switched over to Ruby and Javascript, mostly Javascript. I do not remember how I found Python, I do remember learning it with an online tutorial, shit was easy to get started with.

My codebase running on Python is huge, and they do a lot from automation scripts, to data gathering and database management, never had I been bitten with the "oh noes is so slow" bug since my code is not Google level big, for everything else Python seems rather fast imho

I dunno, big time love hate relationship

How to deal with merge-conflicts:

1. You don't
2. Just clone the whole repo anew again and start over dude

One of many merge conflicts...

Pffft. How did you manage to guide the intern to cause merge conflicts with his own code? Genius

Why do some developers rebase or resolve merge conflicts when you can just email each other changes and force push?

Created a merge request for a big issue last week. Some dumbass co-workers merged several other stuff for tiny shit issues that lead to many merge conflicts now because they didn't pull before..
Nevermind.. will be merging develop into my branch for the third time now.. Got already 20h of extra work because no one minds to merge my request because it's so big and someone might have to check the commit messages what really happened..
Conflicts suck! Co-Workers suck!

That moment when a designer messes up their commit, sees it has conflicts and still decides to push...
Just leave..

Forgetting to git pull before modifying and pushing stuff and then having to resolve a f*ckton of conflicts

Trying to figure out why your code won't work after you fixed it, only to find that the offshore team completely fucked everything back up again 😵

I fucking hate people who want to "perfect" his shit before push his code. Yes damn right. That means he doesn't fucking push his code until it's too late and his "perfect" shit will break everything. Not to mention the cry face he has when there are shitload of conflicts.

Made lots of features to a side project that I was gonna publish in uni. There was some merge conflicts. And I tried to fix by copying files from a backup of the repo I was using.

Accidentally deleted the latest repo instead of the backup. All additions were uncommitted.

That was when I started taking special care with VCS

Once I really messed up with git. Lots of conflicts, strange branching, HEAD in detached state etc. Just cloned an earlier version of the repo into a separate folder, hand transferred all the changes I needed to keep and force merged into master as if nothing ever happened.

I just love it how team git & team TFS managed to migrate same fuckin project several times from one source control to the other and back.. and they all root for their source control as it's the bestest of them all.. yet when presented with specific conflict situation and asked how to most elegantly resolve it I get an 'ugh, I don't know, I've never worked with anyone else on a project let alone on intertwined parts so I never had to resolve conflicts.' -.- Dude, wtf?!

Someone raised a PR for the opensource project "fast XML parser". Since this was a major change, it was difficult to review. I asked for the purpose and requested to break it into multiple PRs, where 1 PR should have related changes only. And any good change but unnecessary change can be avoided to scheduled for later.

We had long arguments for a month or two.

I don't know why but instead of breaking the PR, the contributor keep updating his PR for every commit someone made on the original repo.

He also stopped contributing for other changes, and commenting on other issues. (Change in the behavior)

Finally after 5-6 months, I had to close the PR as it was not active, having conflicts and not as per guidelines.

Questions/best practises for git?

For example:
- use present tense in commit messages. (why though?)

A friend of mine also starts his commit messages with either [Task] or [Cleanup]. Useful for finding Commits in Gitlab etc, because only the first line is shown from the message.

Also, one teacher recommended the usage of branches and the other didn't because of alot of potential merge conflicts when working in a Team or a larger Collaboration. What are your thoughts?

Sorry for the messy post, have a hangover

I hate this stupid git, said by my colleague who really don't understand how to use it properly.
They always fuck up merges, forgets to commit and loose changes and fails terribly in resolving conflicts.

Yeah! Git is not stupid my dear. It is you who is stupid.

Every time a rebase completes without conflicts an angle gets its wings.

Got through 4 hours of merge conflicts before pushing to prod... I imagine this is how doctors feel during an operation... #ef

git conflicts! ;_;

"web developer" 😂👌

Never watch how your coworker solves conflicts 😲

Love it when the maintainer of an open source project you contribute to runs a linter over the whole codebase and force pushes the changes to origin master so now all the Pull Requests in the queue have to be rewritten and have tons of merge conflicts to resolve. Awesome! 😠

So I thought I knew source tree, apparently I do not... Lost a week's worth of work, went to history, saw someone removed it with a commit, and now I'm getting blamed for my own work 'disappearing'. The reason I am being told I am to blame is how I control my branches... So how I do it is that I keep a local copy of the master branch, I keep it updated and monitor it for changes regularly (meaning fetch and pull cause double tap..) before I do a merge, I check for any new code on master again, then using the local copy of master, which I just updated, I pull the master changes into my branch, deal with any conflicts, build and done. Then I request my changes into master once I am happy everything is good.

My question is, clearly there is something wrong with the way I do things, so please source tree users, what is the most fool proof way to pull latest from master so that I don't loose code? 😔

Merging one git branch into another when it conflicts an added line or function.

Like really? You can't handle ONE LINE being added?

My pull request has several merge conflicts but I don't cry. How strong am I?

What if all devs worked together to create a programmed God which only obeys devs? And hates bosses....
I think we can do it guys!

Ps. Bagsie not dealing with merge conflicts.

My little brother started college this year. He hasn't decided what he wants to do, so he took classes in finance and computer science. During finals week, he comes to me ranting about GitHub. "It has to be the most useless tool ever made", he said.

His teachers made him use it without any explanation on HOW to use it. His whole team was working out of a single branch, downloading the zip every time, and struggling to fix merge conflicts. At no point was this ever corrected. This has been going on for an entire year!!!

Safe to say, I spent the afternoon walking him through more productive ways to use GitHub and showing him why it's not "the most useless tool ever made". I don't get why teachers for students to use tools but fail to ever explain how. All that is going to do is deter kids from using tools that could save them when they get a real job.