Join devRant
Do all the things like
++ or -- rants, post your own rants, comment on others' rants and build your customized dev avatar
Sign Up
Pipeless API
From the creators of devRant, Pipeless lets you power real-time personalized recommendations and activity feeds using a simple API
Learn More
-
I was showing my girlfriend how merge sort works... Halfway through my visual explanation, she took the pen from me and finished the algorithm.
I think I have chosen wisely :')9 -
- History teacher: The Spanish-Moro conflict lasted 400 years.
- Student: Why didn't they try a different merge tool?2 -
Me after a large Git merge, after expecting masses of merge conflicts and getting none. Life is good my friend.
2 -
A group of wolves is called a pack.
A group of crows is called a murder.
A group of developers is called a merge conflict. :|3 -
- 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...3 -
This was my day at work today
-Be me at work
-Use git terminal on WORK PROVIDED MacBook
-Decide to clone into a repo into another repo as it was one project inside another project
-Makes changes to code
-Attempts to add .
- warning: adding embedded git repo ...
-Apparently needs submodules
-Shit doesn't get added
-During this get asked to create 2 new branches and modify some code
-Do that specifying files to add as add . breaks everything
-Has 3 branches now detached from master
-Super confused where anything is and what's going on
-Go back to branch for other repo to get added to
-Spends 30 minutes trying to understand submodules
-Gives up and deletes folder moving it elsewhere
-Commits begin failing everywhere. Super confused.
-Get everything figured out and commiting
-Goto merge all branches to master
-Merge conflict with .DS_Store
-FML
I think I'm done guys12 -
Successfully resolved my first merge conflict WITHOUT destroying the whole project.
#eleventh-time-lucky3 -
"Before you marry someone, you should first give them a massive merge conflict to see who they really are."2
-
Teamate: Hey I'll checkout you're branch to see what you've got done today.
Me: ...Ok.
Few hours later Teammate forgets to change branch and overwrites all my code in my branch causing merge hell and creating hours of more work.
Me:...what in the f***?!
6 -
The first time I ever did a PR on Github, I forked the repo, did the fix, committed the file and put the merge target to my fork master instead of the original repo master.
I then proceeded to accept my own PR and got so excited that it was so quick to merge.1 -
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 conflicts3 -
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.8 -
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'.4 -
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?2 -
Am I the only person that deletes their github repo and then uploads it again when you encounter a merge conflict?13
-
I want to get this fake axe: https://amazon.com/Realistic-woodcu...
I want to hang on my wall at work and label it:
"merge conflict resolution tool".
Is that too violent for a joke?
9 -
> 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 goes4 -
Summary of my week
Day:
Fix merge conflicts at work
Night:
Fix merge conflicts in Skyrim mod scripts2 -
When you're working on the same project and git branch with another intern and he decides to make copies of the files and rename them to avoid having to merge his code with yours. ._.4
-
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.
9 -
2 approvals required for merge (not including self) , only 2 devs currently present because vacations
/shrug1 -
From a buddy:
A friend's comment on the latest merge conflict on the integration branch:
"O brachName! my branchName! our fearful sprint is done,
The build has failed with every merge, the goal we sought not won,
The release is near, the worst I fear, would Product be exulting?" -
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 😭1 -
$ git add .
$ git commit -m "This HAS to be online soon"
$ git push
*merge conflict*
*did not look at difference*
*using mine*
$ git commit -m "resolv merge conflict"
$ git push
$ ssh root@x.x.x.x
# git pull
# cd /path/to/webapp
# npm run production3 -
Don't know if this was posted, but that's not stopping me...this is from awhile back before I discovered devRant
1 -
Dear God please if you help me fix this merge conflict, I'll be a better person.....please
......please 😭8 -
Friend1 (being lewd): I'll merge you in to my git repository
Me: When you try to merge but she has her special days of the month it's called a merge conflict
Friend2: It's not a merge without a little blood1 -
*coding at 1AM*
Result: wrote a whole feature in what was supposed to be a git merge 😅
But hey it turned out to be very well documented 😜 -
Doesn't matter how many years I do this job, a merge conflict will always stop my heart for a good few seconds.7
-
Git pre-commit check means that only team lead can merge to master. Team lead is also pulled in meetings all day everyday and so never has time to merge...1
-
I just broke out of merge-hell.... It was a mere 2 and a half hours... But my migraine says it was eternity.... 😶
-
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 :) -
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.3
-
When you just merge master into development branch and whole Jenkins wall turns red. Wtf? Wasn't me bro.. o.O
-
Deploying on stage.
Testing on stage.
Why does the issue persist on stage?
Testing on local. It is fixed!
Wtf?
Wtf!?
WTF???
Oh.
I did not merge my branch and deployed a new version on stage without any changes 🤦
It's Friday. I should go home.2 -
Take your time with merge conflicts, and put the entire file in another editor in case you really mess up.2
-
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.2
-
When your tech lead revokes everyones merge priviliges on Github because of an issue with "code disappearing from the repo" which he originally suggested was a bug in Github and we should call them for help.
-
next hacktoberfest: prepare CoC and generated PR descriptions, splash vomit it onto everybody who participated and offers high difficulty merge only rewards - PR and get it merged - if they don't merge it, tag some twitter accounts automatically based on hair color and ping some news outlets via twitter and mail. 🙂1
-
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.1
-
bubble sort
promotion sort
quick sort
school sort
heap sort
hr sort
merge sort
sex sort
selection sort5 -
Senior dev:- "Limit your commits to have maximum 10 changes"..
Also senior dev:- Doesn't approves pending merge requests for days...5 -
!rant
I love gitlab but what's up with merge requests taking forever.
I'm not the waiting kind. Smash a keyboard or something.3 -
If you're having merge problems I feel bad for you son, you've got 99 problems but my branch ain't one!1
-
Dev: can you please merge this to master?
DevOps: ok
Dev: thx
QA: wait... Who tested this?
Dev: oh it works, it was tested...
QA: by qa?
Dev: ... <Dev2> tested (sitting right next to him)
QA: ...amIAJokeToYou.jpg6 -
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?5 -
Outlook - " You have many duplicated contacts. Want to merge ?"
Me - ( inside mind thinking .... wtf, there are no duplicate contacts ) Ok do it.
pressed 'merge' for every contact ( Yeah, 'merge all' wasnt even there. Fucker designed the application which ask user to merge every contact, one by one ).
End Result - Brain Fucking piece of shitty microsoft' outlook android application, created 5 duplicates of all the contacts. Cant be more happy. Now i have 1000 contacts.
Microshit at its best again
Microshit managed to keep my trust on its products. Always, performs like Tatti ( Shit in hindi )
Edit - A wise man honoured Microshit with 'Macroshit'1 -
I was wondering why my tutor needs a whole ass week to accept my MR.
Today he rejected one, so I got a chance to look at whatever he's doing.
He's checking line by line every single test I make and creates a variable for each dumb thing.
𝘦𝘹𝘱𝘦𝘤𝘵(𝘴𝘰𝘮𝘦𝘵𝘩𝘪𝘯𝘨.𝘪𝘥).𝘵𝘰𝘚𝘵𝘳𝘪𝘤𝘵𝘌𝘲𝘶𝘢𝘭(𝘴𝘰𝘮𝘦𝘖𝘵𝘩𝘦𝘳𝘛𝘩𝘪𝘯𝘨.𝘪𝘥)? No, this is bullshit.
𝘤𝘰𝘯𝘴𝘵 𝘴𝘰𝘮𝘦𝘵𝘩𝘪𝘯𝘨𝘐𝘋 = 𝘴𝘰𝘮𝘦𝘵𝘩𝘪𝘯𝘨.𝘪𝘥
𝘤𝘰𝘯𝘴𝘵 𝘴𝘰𝘮𝘦𝘖𝘵𝘩𝘦𝘳𝘛𝘩𝘪𝘯𝘨.𝘪𝘥 = 𝘴𝘰𝘮𝘦𝘖𝘵𝘩𝘦𝘳𝘛𝘩𝘪𝘯𝘨.𝘪𝘥
𝘦𝘹𝘱𝘦𝘤𝘵(𝘴𝘰𝘮𝘦𝘵𝘩𝘪𝘯𝘨𝘐𝘋).𝘵𝘰𝘚𝘵𝘳𝘪𝘤𝘵𝘌𝘲𝘶𝘢𝘭(𝘴𝘰𝘮𝘦𝘖𝘵𝘩𝘦𝘳𝘛𝘩𝘪𝘯𝘨𝘐𝘋)
I don't even know why you would take a week to accept a merge request when all you're doing is creating variables for things you use only once. I'm not even mad, I'm not ranting, I just need to know why would you do such a thing17 -
How to deal with merge-conflicts:
1. You don't
2. Just clone the whole repo anew again and start over dude -
you don't know what true anger is until you have to manually merge a big assignment because your colleague made unreported changes ALL OVER YOUR GODDAMN FILES
-
Just fixing a broken build due to another bad merge by SVN. There was no reason it should have fucked that merge up but somehow it did.
Of course I didn't double check by building locally so that was my screwup but what I wouldn't give to use a decent source control tool1 -
"No merge conflicts, ready to commit."
Such sweet words from TortoiseHg, and it's not even valentine's day! -
Some things never change
> Have to deploy only one feature to production
> Create branch from latest tag, cherry pick the correct changes
> Mess up merge
> Almost deploy resulting broken code to production
> Realize at last moment
> Let out a loud sigh, start over
Every damn time.4 -
I am fucking dumb, why I've created an empty project to implement the new feature instead of making a fucking local branch. Now I need to merge this shit manually. fuck fuck fuck5
-
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 off8 -
Auth0 and Okta merge.... Is Cognito the only other major player here? This merge now makes an Auth monopoly!7
-
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! -
Why do some developers rebase or resolve merge conflicts when you can just email each other changes and force push?4
-
Pretty difficult to control bad rebasing so... merge for the win!!! #Git #developerproblems who is with me??
-
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! 😠2
-
By Boss insists to do branch merge in a Skype meeting after work time.. he has nothing to do with development but he insists to be with us and lead the procedure..
He thinks this is how Devops works..2 -
My coworker pushed changes to almost all of our ASP.NET pages. However, he did so by pushing only his files, and when asked to merge, he overwrote all of our changes to those pages since he last pulled from the server, which was ages ago. We were three changesets past that overwrite before we noticed things we'd already fixed were gone. Had to revert, which we didn't know how to do, and we didn't know what he changed in his push, because he didn't comment on the changeset. He undid weeks of work, thankfully we only lost a few days worth over we reverted. We're going to have a quick lesson on merging correctly on Monday when we all get back10
-
> merging feature 20155
> Removing debug messages for previous commit
> Fixing bug from feature merge
> Fixing bug from previous fix
> Merge fml -
After merging 2 branches, Git randomly decided not to merge one particular line (the place where my newly defined function was called) and that caused a fixed bug to reappear. First time in 4 years I am witnessing Git do something strange like this— probably an issue in the “merge by ort strategy”.5
-
Yesterday, I was expecting my merge request to be closed.
I've done all the stuff my tech lead told me to do.
All tests passes, green light boyzzzzz.
Gitlab CI pipeline passes, greeeeeen light I said.
In Jenkins everything f*cked up...
Why ??
Well it was a conflict with 3 other MRs, missing rebase from other dudes.
And because they were remote working, got to clean up all this mess.
That's was a day off.
PS : well that's was not so off, I could fix a UB on a ternary and extend a test which was not covering some cases.
PS2 : learn git damn3 -
!rant
Relationships are like github projects, you can push, merge, commit, have issues, etc. Just don't go open source....5 -
If git merge automatically performs a commit to the main branch, how do we add a message to that commit?16
-
Today's the day I realized my branch was better off if I just restarted from master and cherry-pick the commits I liked from the old one. This is what I get for the branch hanging around so long.
Lesson of the day: Merge early, and merge often. -
Algorithms class assignment..
"Prove that the merge procedure cannot run in place".
Searching google...
There are multiple merge procedures (though super complicated) that run in place.
What's the use of this class if we can't be practical because we must be theoretical, but we can't mention real theoretical stuff because it's so complicated??
I mean we are being told something that is just wrong..
I really hate this fucking professor. She went to Oxford and now thinks she's the smartest person in the universe.. -
Waiting to merge the rest of the team’s new code because you don’t want to deal with migrating your test account to a new backend until your feature’s ready, finally finishing your feature (!) and then seeing 100+ merge conflicts and realizing you‘re better off just re-implementing all your feature code into a new branch, & deleting every trace of your old branch so nobody sees the 1000+ merged commit mess you’ve made -_- today was supposed to be easy...
WHY WOULD ANYONE NEED THREE DEPENDENT SUBMODULES ANYWAY?!?! 😩1 -
Wow! My rights to merge work is just revoked. This is fucking bullshit. Whenever i want to merge my work the project lead has to do it. And when he’s sick ill have to go to the fe lead, who is in meetings 24/7. Fucking great2
-
Our Risk team is making us enforce having an approved change record before teams can merge to master.
As in, people will get in trouble if they complete a merge of a pull request outside of an approved change window.
This, of course, is completely separate from the change record they'll need before they deploy the code anywhere...8 -
I just have one fellow programmer at work...
He actually managed to create a merge conflict on his own, because he worked on two branches simultaneously, and then assigned me to resolve it, even though I worked on a whole other part at that moment and have no idea which parts he wants to stay and which to be discarded! Take care of your own shit for god's sake!! -
Git Merge 1 of branch to master: COMPLETE
Git Merge 2 of branch to master: (code change on branch, no change to master, exactly the same conditions, command, and procedure as before) FAILED - CONFLICT
Guess I’ll just die?3 -
I finally got my stickers. I feel like I have transcended existence. Or maybe successfully cleared a merge conflict! 😂
-
What's better in general:
#1 master merge -> production
#2 master merge -> button -> production
And why?
At work we currently use #2 because sometimes we need to make manual changes or update images on prod before we can fully update the code
Edit: This should have been a 'question' not a joke/meme, sorry about that -
Today a merge deleted a bunch of code I had pushed in different branch. How the fuck did that happen? No conflict nothing! How can git delete something like this?!3
-
Important merge request howto:
- Hey, I implemented very important server change and it doesn't break compatibility with current clients!
- Cool, but we don't need this compatibility code. We'll adopt our clients as soon as the merge request is accepted.
- Ok, I removed support of current clients.
- Cool, but it's too dangerous to adopt our clients rights now. We'll accept your merge request later. Some other day... somewhere... some other time... -
Management wanted all features finished by close of business yesterday to start testing before a demo next week.
I started work at 8am to get my task out of the way early. Unfortunately there was another persons task that mine was dependant on. I kept telling people it needed to be merged so i could integrate it with my changes.
It was merged at 5pm.
I was still fixing merge conflicts at 8pm. 😑1 -
Wouldn't, it be amazing if we could have smart merges that understand the basics of the laguage you are using, and umderstands changes like moving a function, and helps by giving suggestions on what could be done to fix the conflict?1
-
That moment when you go to merge a branch and realize no one rebased for 3 weeks and your whole day will be merge conflicts...1
-
When you git pull and there are merge conflicts and you commit without resolving conflicts and you push 😂😂1
-
How do you deal with situation when u need to merge multiple feature branches to develop branch? All feature branches have develop branch as base. So as soon as one feature is merged to develop then there will be contlicts in other feature branches.
Should I merge first feature branch to develop, then rebase feature2 branch on most recent develop and then merge the rebased feature2 branch to most recent develop and continue like that?
What if later I need to do hotfixes for previously merged branches? Should I revert them then rebase them on most recent develop and once again merge it to develop? Or should I just make small commits for fixes.10 -
New guy likes to both approve and merge other people's pull requests have he approves them. Please don't merge other people's pull/merge requests. Other team members may have comments too! The person who created it should merge it.1
-
You want to re-merge a branch after a previous merge has been reverted on the mainline branch?
That's easy! Just revert the revert commit and then merge again. Because logic. -
The day you wanted to do something insignificant and you are stuck fixing merge issues .. I hate it i freaking hate it..
Lost an hour doing stupid bullshit merge issues.. -
I just picked up a hobby project which I hadn't worked on in a while and started doing some major refactoring. However, I forgot to pull before I started and didn't realize that I made some updates on a different pc. Then as I wanted to push a ton of changes I noticed... I didn't even attempt to merge because it was one giant pile of shit conflicts - and I didn't remember what changes I had made earlier. So I decided to say fuck it and
$ git force --push
Feels *so* much better than pulling my hair out over conflicts :P2 -
The wonderful feeling when project was finally relesed and deployed, you have no chance for any more last minute fixes and you can finally merge into master and break everything :-)
-
No google I don't want result about marketing, features of set Software.
I want fucking answers why the fuck our merge tool that comes with that stupid software does not work! And setting an alternative also does not work!
Just Answer my fucking question!
Setting up "tool" with "Source Control client" or alternative. -
Nothing like starting your Monday morning with a call from your senior developer saying that the merge went horribly.
-
Coworker just showed me how he avoids merge conflicts and I'm undecided on it. We use feature-branch workflow, so if a feature takes a long time to finish, it may mean merging master multiple times. He avoids it by stashing changes instead of committing them, then when he needs to merge master into the branch it's still clean. When the feature is done and he's ready to commit, he pops the changes and git diff shows all the changes before you push and you just change what you need instead of being forced to use the horrible merge software.
There must be problems with this, right? This seems too easy for it not to be the standard.5 -
One thing I absolutely hate is resolving merge conflicts but if Git wouldn't have been there, I would have not liked that..
-
Finish the story and all tests pass
*notification another merge request been approved
Pull changes build, all tests faill
-
I have been fixing tests all day and some other dev managed to cause merge conflicts, now my branch is in a permanent state of merge after I pushed with force.. I'm done...
This crisis is also hitting our company and don't know what that's means of me as I just joined...
I'm glad it's weekend1 -
Looking back on it, I don't understand why I used merge commit strategy as go-to to merge git branches the first +-3 years of my career. It sucks
Guess I was just afraid of rebase after I accidentally erased history the first time I used it and failed.4 -
I've just received a merge request for a feature that we outsourced. How do you best deal with substandard quality?
It's a merge request for roughly 2k lines of code and I've already noted down 25 comments and I'm only at my first file :(4 -
Is git a history of what happend or a list intentional changes?
Had this discussion with my boss. He said i shouldn't rebase my feature branch because it is too much hassle (I did some squashing and fixups). I should just commit on top and merge master into my branch.
What is your git philosophy?
Do you "own" a feature branch until you create the PR?6 -
Git Question:
Semiunusual state here. Have a branch I'm trying to merge into develop and there are a LOT of merge conflicts, some head way has been made in this merge branch..
HOWEVER
I'm wondering is there a way to "suspend" the branch/merge progress and go back to develop?9 -
'Cuz every time we merge, I get this feelin'.
And every time we merge, I swear I could diff.
Can't you see my merge conflict, wanna force push commits,
in the remote history of Git
https://youtu.be/4G6QDNC4jPs?t=323 -
Humpty Dumpty had a bad merge ...
All the team's horses and all the team's men couldn't merge the code back together again. -
Your branch and 'origin/foo/bar' have diverged,
and have 2 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
git pull
hint: You have divergent branches and need to specify how to reconcile them.
git merge origin foo/bar
Already up to date.5 -
How to do typically avoid the necessity to rebase a WIP branch after every other merge on the default branch?3
-
I use GitKraken to only to resolve merge conflicts. Recently, they decided to make app unavailable for private repos.
Suggestions?3 -
git merge "conflicts"
(not really an issue, but still a waste of time and concentration, when every now and then, using more than one branch, small edits, merge, and rebase, git diff complains about "conflicts" that are obvious to solve for a human but still not for a machine, despite the hype about the age of AI, coding co-pilots and the like...)5 -
So yeah I'm currently working with a small team on a project that will save our company around 1000 FTE (literally ~1000 people) costs per year.
But we forgot to do branches in our gitlab project... And now I needed to resolve a merge conflict on a PyQT UI file. Fuck my morning I need more coffee!1 -
JavaScript query:- I have number of sound clip on server. Which user can create different mixer sound by combination or by merge. How can I save the output merge sound by JavaScript or php in user local desktops or mobile.
-
so we started new branch to develop new feature. then merge to staging. then from staging merge into master. master means production for us. this is website so this means continous integration. how you deal with versions? what i do wrong?
-
I created a short tutorial about git merge and rebase. Hope that you will find it interesting! Any feedback is very welcome :) https://dev.to/lmtx1/...3
-
Used a GUI to merge branches today. I managed to create a local branch with the same name. Merge my changes into that. Then merge my local into the remote of the same name. The network graph is a little crazy right now.
-
Completely noob question and before you say it, yes I have googled but I'm tired and I just get walls of text.
How do I merge a pull request?
A nice guy has submitted a pull request to my repository on GitHub, how can I merge it??
I tried what I thought was merging but it said that a file is conflicting. I tried deleting the file and it still didn't merge.
4 -
GitHub: merge conflict in the readme document.
Me: I don’t care just skip it
GitHub: no go just use git to fix it
Me: I DONT WANT TO? CAN YOU JUST ADD SKIP IT OK11 -
Just rebase a merge conflicts with LFS enable. What a fucking nightmare. And bitbucket, please eat a dick you useless cunt.
-
How come when implementing merge sort the mid doesn't need to deal with odd/even division?
I know int will always go down if there is decimal but how will it cover the whole array?
Full code:
https://gist.github.com/allanx2000/...
I guess in general, array indexing that involves dynamic cutoffs always confuse me.
How do you think about them without having to try things out on paper?7 -
Weird git when i pull it does not conflict or anything just merge it with smiling face, then when i checked my repo, my work is gone. Whats wrong with this, anyone encountered this?
-
BitBucket has an option to delete the branch on merge which for most cases make sense.
But what about release branches? needs 2 merges for master and develop.10
Top Tags
Weekly Rant
View