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
Get a devDuck
Rubber duck debugging has never been so cute! Get your favorite coding language devDuck
Buy Now
-
When you stare into git, git stares back.
It's fucking infinite.
Me 2 years ago:
"uh was it git fetch or git pull?"
Me 1 year ago:
"Look, I printed these 5 git commands on a laptop sticker, this is all I need for my workflow! branch, pull, commit, merge, push! Git is easy!"
Me now:
"Hold my beer, I'll just do git format-patch -k --stdout HEAD..feature -- script.js | git am -3 -k to steal that file from your branch, then git rebase master && git rebase -i HEAD~$(git rev-list --count master..HEAD) to clean up the commit messages, and a git branch --merged | grep -v "\*" | xargs -n 1 git branch -d to clean up the branches, oh lets see how many words you've added with git diff --word-diff=porcelain | grep -e '^+[^+]' | wc -w, hmm maybe I should alias some of this stuff..."
Do you have any git tricks/favorites which you use so often that you've aliased them?51 -
I just did git branch in someone's repo and got this ..
master
master_backup
master_bckp
master1
master_aug17
I'm armed and ready .. !!
😐😑😐😱😩😡15 -
Welcome everyone.
Today I signed my first contract!!!
Front end
Part time
I'm 30.
This is still a start14 -
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...9 -
Pro tip: NEVER work when you’re tired, and if you absolutely HAVE to, make sure you do it in your TIRED branch.10
-
- Spent 4 hours coding up the most complex but cleanest test I've ever written. Well let's commit this as a save point
- accidentally committed to master
- ohshitohfuck
- Stackoverflow how to fix this shit
- reset head
- destroyed all my work 😱
- fuckfuckfuck
- made a new branch
- ctrl-z in my editor to recover all my edits 😳
- commit to new branch
- dodge bullet, heart race decrease10 -
Developer creates pull request.
I hold suggesting changes.
Developer creates new branch and new pull request with exactly the same commit.
Another Senior developer approves pull request.
This will be discussed tomorrow morning!29 -
"The password must be 6 to 32 characters long and must contain atleast one uppercase character, one lowercase character, a special character, the md5 hash of your last name, a dried olive branch and the blood of a unicorn."6
-
"I'd rather post my nude pictures in slack than this unfinished feature branch... I would just feel a bit *too* naked"
— coworker4 -
Senior Dev at work told me to cherry pick commits from another branch....later found out that it is an actual git command ! 😅
git cherry-pick <commmit>9 -
Confession of the day:
1. I work in release mode
2. I work on the main branch only
3. I test on production13 -
Mastering git has become the best thing ever. I feel like a real code monkey. Swinging from branch to branch. Eating all the bug-eeee eeee ahhhhh oooh aaaaaaAAHHHHHH!2
-
What do you mean the master doesn't build? How can it not build? Stop breaking master! It is not your personal playground branch for 🐙🐙🐙 sake!!!6
-
- 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 -
Me: Damn it guys, you broke the master branch again.
*Fixes master branch*
*15 minutes later*
Coworker: Bro, master branch is broken again.
Me: Oh for fuck's sake, who did it this time?
Coworker: You did.
Me: I have become the very thing I've swore to destroy.1 -
My computer science teacher won't stop developing on the production server 😭 he switches the branch on the production machine to dev all the time and merges broken code into master. Kill me4
-
Dev deleted a branch I was working on. When I asked him why, he responded "I don't know. I didn't create the branch so I thought I could delete it"
Frack!9 -
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 -
!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 perfect6 -
3 hours of productive coding in the morning then 8 hours of swearing, cursing, searching stack overflow, reinstalling eclipse and git only to realize in the end I was trying to push into a "protected" branch...
Why? because i'm stupid...5 -
My first contribution to a GitHub project was finally merged to the master branch today! It was just a bug fix but it’s a start!!11
-
I need sleep. Somehow I managed to create a file named ":w" and a git branch named "_D".
Writing "git branch -D _D" was the weirdest thing ever.6 -
My team mate has just found the best conditional statement I've ever seen, in a source code he received from the client.
if (1 == 1)... and it has an else branch :D11 -
Fvcking project manager wants me to commit my partials code to the master branch just to let our employers know that we did something today! That's why you are there to relay our predicaments to them, you piece of shit!
Now he is insisting it the whole team. Fvck! Are you nuts? Do you really understand what version control really means? Why master branch, why can't we just create fucking different branch and push it there if they want reference! Commits are supposed to be a fix code or update not a broken and unfinished piece of codes! I will fvcking cross my finger after messing up the master branch. Now it looks so disgusting to me.9 -
When you accidentally commit and push under the wrong branch and the wrong branch in question is master.
8 -
The "new guy" just merged master into a release branch.
The build server started bumping versions on the release branch and build "corrupted" installers.
Another developer had to spend a whole day trying to remove all the invalid commits.14 -
$ git push
> current branch is behind
$ git push -f
... 5mins later coworker is asking why his commits have disappeared.7 -
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 -
After 5 years in retail, I finally got a job in the programming branch.
After two months of working with WordPress I finally got a website that isn't in WordPress!!
I'm so fucking pleased right now!!!6 -
Just saw a repository with branch name - 👶
bitbucket gives this - git fetch && git checkout 👶 for checking it out,
wondering how would anyone checkout this branch without copy pasting the above line from the web xD10 -
Your git commit history on your personal branch when you're freaking out and cry tears in joy because the code you spent the whole previous week on to somehow get it to work suddenly DOES work.
3 -
Starting a third year computer science course. Lesson 1 of web API production. Git. Lecturer tells us to do a different branch for every commit so it's easy to roll back.
Nice.9 -
"Server deployment is automated from git, so dont merge things into the master branch without permission"
Oh ok
>i create new branch
>push unfinished code because i gotta hurry
>server breaks
Well golly gee seems like you did a shit job at automating7 -
Developer confession.
I always git push a new branch even though I know it will error as there's no upstream, just to copy the full git push with set upstream arguments from the error message.12 -
*** writes unit tests with great zeal and fervor ***
IDE is reporting 85% line coverage, woohoo!
*** grins like a bastard, thinks it's perhaps time to stop and celebrate ***
*** runs branch/conditional coverage... ***
37%
*** facepalm ***3 -
today I pull a project to take over from my colleague
today I notice all commits where on master branch
today I leave this world T_T19 -
Android oreo made me change so much code and broke so much shit like background services that my latest branch in git is FuckAndroidOBranch
6 -
When a dev fixes a bug, forgets to submit the branch to the repo and promptly leaves on vacation to a foreign country for 2 weeks.
-
Please, stop being afraid of git rebase.
Please stop merging master branch into feature branch just to fix pull request conflicts.2 -
Recently someone from QA came to me yelling "Why did you push to master? You have a feature branch for these changes..."
I replied "Indeed. Coincidently it's called 'master' "2 -
A colleague's story...
"I named this branch after my girlfriend at the time, so that I could check her out at my will. I texted her about this, she was not amused..."2 -
Name of the branches in a git repository are like
dev
dev-branch
dev-hotfix
dev-test
dev-merge
dev-app
dev-com
dev-com
dev-ref
dev-staging
dev-username1
dev-username2
dev-username3
.
.
.
.
.
.
Master -
dev: Can you add a master branch to the following Git repositories ? They are newly created and we don't see any branch.
me: Whaaattt are you asking ???
This is how the day started.
#quadruplefacepalm1 -
!rant
I'm freaking tired of telling colleagues at work not to create feature branch in upstream and use their fork instead.
Turns out idiots can't recognize the difference between a forked repo and the upstream.3 -
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
-
How can people use git like that ?
Paris' metro has a simpler network.
If you can stop yourself from all working on the same branch at least do `pull --rebase`.
5 -
```
Your branch is behind 'origin/master' by 562 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
```
`$ git pull`
```
251 files changed, 103274 insertions(+), 1361 deletions(-)
```
okay fuck.11 -
+ “I’m drunk, but I can still drive.”
+ “I’m tired, but I can still finish this piece of code.”
+ " I don’t need a silly seatbelt.”
+ “Tests? Naw, I’ll just push this to the Master branch.”2 -
The moment when you made branch restrictions, but your colleagues just remove them so they are able to merge their branch into master.2
-
LPT: Name your branch after your user name.
If you select the branch in your IDE the status bar shows "Checking out dbx12". So at least someboddy is checking you out. -
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 -
Minimal comments, no tests, push to Master branch... *Cough* though, this is all for personal projects, not team projects.2
-
[First rant] When you commit the wrong code to the deployment branch.
This happened to me yesterday 😅 Reverted it but everyone knows what I did by seeing the commit history
5 -
Most of the work we do is committed into various branches. Everything is merged into the master branch.
Colleague was on vacation. I was working on a bug that was fixed by him some time ago. All I had to do was find the commit and merge it into the relevant branch. I didn't know which branch to search so I just looked into master. Search all commits on master made by colleague.
All I see is:
"Merged into master"
"Merged into master"
...
"Merged into master"
MERGED FUCKING WHAT INTO MASTER?4 -
Source tree opened
Finds new option 'cherry pick'
Wtf is this
Clicks on it
Wooow, there goes my master branch again4 -
I made some changes in existing repo on my own branch. Created PR for it to be reviewed and merged into master.....
That was more than a week back. But senior engineer never merged it.
Today I see that he closed my PR, deleted my branch. He created his own new branch, added my changes and some of his changes and created PR.
What shit is this?5 -
Thank you, GIT. Thank you. Your reflog saved work of months after someone deleted the wrong branch.1
-
Look, i'm trying to do this 365 days of code and guess what? I forgot to push my local changes to the remote branch. I'm on my 43rd day streak and fuck it I have to start again.
10 -
Terminal Devrant has been updated and now works! , Images are up an.
All is on the alpha branch.
https://github.com/Supernerd11/...3 -
OPEN SOURCE CONTRIBUTION
Original post link:
https://linkedin.com/feed/update/...
Start your open source journey.
To Push your personal project to GITHUB.
1. git init
2. git remote add origin [link]
3. git add .
4. git commit -m "commit message"
5. git push origin master
To contribute to someone else project use the following steps:
1. Fork the repo.
2. Clone the project in your local directory using git clone [link]
3. After clone, create a new branch. git branch [branch name]
4. Checkout to new branch created using: git checkout [new branch name]
5. Make changes in Project then 'git add' and 'commit'
6. Push back the changes using git push origin [newbranch name]
7. Open Github web view and click the pull request button and you are done.
Follow Up Post: https://lnkd.in/fEMbTPC
GitHub Link of GIT-CHEATSHEET: https://lnkd.in/fhy4hmu
HD VIDEO: https://lnkd.in/fmq8GTd5 -
Day 1. Push branch. Make pull request😀
Day 5. Got reply to fix some silly stuff🤡
Day 6. Apply changes. Ask for review again.😊
Day 7. Needed to work for another project for two weeks🤝
Day 25. Came back and pull request and branch were deleted from server 🧐🧐
Day 26. I merge my local branch copy into master and push it to server. So long bitches! 💅💅8 -
See code of a dyslexic intern
Neither do I want to correct him without knowing it to be respectful nor do I want to work with this code
> mfw his branch gets merged into core
4 -
Someone who was lazy to make changes from dev branch, making code only in production without updating dev then wanted me to merge from production to dev because he was scared ☺️
-
New dev at our company. After two weeks he has finished a feature for a project. Want to merge it into the dev branch ... he worked in the master branch.2
-
Dear CTO who approved his own code changes without testing or review,
Why do you hate my master branch? What has my master branch done to you? Did you have to break it?3 -
When you just merge master into development branch and whole Jenkins wall turns red. Wtf? Wasn't me bro.. o.O
-
My new team mates type in the date and time of commit on their commit messages and maintain code only on master branch. Some people deserve have their write access revoked.2
-
Wrote a small fix to some css and asked the production guy to pull it...
Prod: pull what?
Me: the prod branch.
Prod: from where?
Me: the only git server we have.
Prod: Oh yea let me go and download the zip, give me like 5 minutes I need to open chrome.
Me: (smh)
He's been unpacking copies of the prod branch by hand for months7 -
!rant
For people like me, always committing on the wrong branch, this is fucking awesome:
https://github.com/jimeh/...2 -
That moment when the code doesn't compile due to an error in a different module that you never touched after merging the master branch into yours...1
-
When I'm still a beginner in git, I always use git push origin <branch_name> --force, for the sake of pushing my code on the master branch. My co-worker always complain why the hell there's always conflict on the master branch.2
-
Cleaning up after yourself if so damn important. Even your git repos:
# always be pruning
git fetch -p
# delete your merged branches
git branch --merged | grep -v master | xargs -n 1 git branch -d
# purge remote branches that are merged
git branch -r --merged | grep -v master | sed 's/origin\///' | xargs -n 1 git push --delete origin -
An amazing git story: A month ago coworkers did research and started with merge requests. Their workflow is as follows: A Feature is developed in a branch, then a merge request is opened. After a very short review it will be closed (rejected) and merged without request. (wtf!) After that the develop branch will be tested later, in case of bugs, a new branch per feature is opened.3
-
I guess I'm doing something right.
The branch executive just asked me why I haven't taken any time off :O5 -
So I just spent a 7 fucking hours recreating a feature just to find out that I already did it once. Don't forget to checkout the correct branch fellas.
-
Don't rebase and force-push a shared feature branch that's still in active development. FFS. A "senior" developer should know better.1
-
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.2
-
!rant Still feeling poorly, so still making commits on "fever" branches, but that doesn't stop me from making a new thing and deploying it from a fever branch! *maniacal laughter*
https://cat-icons-for-great-good.netlify.com/...8 -
People who willingly install and use development branch web browsers and then send inages of exploded websites when using said browsers.
-
Our Other it team asked me to create a new repository instead of a new branch in my project just cuz they thought branching would be more time consuming than maintaining a separate repo for emergency bug fixes.
-
Biggest sin? Easy. Pushed directly to master branch and deployed to prod. I should mention it was something very small before I get crucified😂
-
Just had someone branch off my repo of some class assignments I did last year.
What are they up to.....
Better not be doing what I think he's doing.5 -
"There's a branch on terraform-our-project called instance-rols"
"Can you send me a link?"
OMG are you really so fucking lazy you can't go to the fucking git web interface, look up the damn project and click on the fucking branch?1 -
When you git cherry-pick for the first time, screw up, rebase-drop, repeat, screw up again, and end up just pasting the correct versions of the files and commiting on top of the branch.
Dirty, but it works.4 -
!rant
True its a two days old story but now ReactJs 16 is out, and license is now MIT.
this is a good way to start my day :) -
Current work project: Ok where is the master branch?
Coworker: Oh we lost that one a few months ago due to some merge conflicts...5 -
I'm too lazy to set up a proper code review from a branch. Instead, I just make dozens of quickly obsolete tags. I should probably learn to use subversion better, but... ¯\_(ツ)_/¯
-
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
-
https://devrant.com/rants/1547095/...
You see that ?
It didn't change. At all.
Let's call it an emergency but let's not do it, yeah.1 -
git stash pop'd on wrong branch, hadn't realized it until after a bunch more work. Then continued screwing things up and unit tests are failing.
This is not a good coding day. -
Commit changes that is working perfectly.
Goes on vacation for 2 days.
Comes back to work and only half of my changes were merged to the test environment.
Also, the merge master decided to update my branch with the test branch.
Nice... now I have to redo most of my work.1 -
I'm still new to using version control and now learning Git with GitHub, working on my own project.
My current workflow is:
1.Clone GitHub repo
2.Make a local branch to add new features/fix bugs
3.Work on the feature/fix
4.Merge the local branch with local master
5.Push origin master
There seems to be no point in making remote branches because I am merging my branches locally. Am I doing it wrong?4 -
Why fucking my coworker push not compilable code on master branch??
Ok we are developing it, no yet release but I can't compile it for my tests.
4 -
If you're having merge problems I feel bad for you son, you've got 99 problems but my branch ain't one!1
-
TEAM MATE: let me sync my branch with upstream master
*starts typing*
git pull upstream master
ME: Nooooooo!!!!5 -
When I have a Jenkins build fail, then fix the issue, I run the build four more times manually to make that branch "sunny" again.1
-
Webpacker works on branch master.
Webpacker doesn't work on the "back-end" branch.
I didn't touch anything javascript related between the branch's creation and now.
Why. Why why why why why.
4 -
One of my colleague uses git prune to make a local branch track origin. I told him the way to do this (git branch -b newbranch, git branch -u origin/whatever). He says why do it in two commands when you can do it in one. I asked him what do you think git prune actually does? He says, "Who cares?". It pains me deeply.
-
It's only took me all morning but I got git properly setup on our server.
We have a folder in the repo that holds the distribution files. They get split to the distribution branch. Then the hosting service clones that branch.
Finally we we got some proper version control and a good testing environment.
Oh yeah the distribution files are minified using grunt. -
Work on and maybe release some of the stupid ideas I have which would require me to learn a new language (I want to branch out from JS).
-
Doing a bunch of stuff and then commiting it all at once instead of small, incremental commits.
Also commiting to the master branch on forks and then PRing that instead of putting that in its own branch so I can pull upstream easily. -
Is it just me, or does anyone else find it extremely satisfying completing a successful git push -u origin master?
-
Shoutout to any CommBank developers, I've been dreading going in to a branch to open an account - turns out it's only a 3 minute exercise using the website 😌👏 👏1
-
Main branch running locally - fine
Main branch locally connected to QA dB - fine
Main branch on QA server with QA dB - NOPE
OK - build main locally, push to QA server - fine
WTF.jpg
Main build by build server, push to QA - nope
Rebuild QA vm and dB - build main, push to QA - nope
Turn on full server logging - PASS.
MAXIMUM WHAT -
Remember this : https://devrant.com/rants/1547095/... ?
FINALLY some updates.
Just to say they deleted the branch I was trying to merge on during the month, so I need to redo the pull request and rebase.
(ﾉ｀□´)ﾉ⌒┻━┻5 -
Executing git commands you found online as proposed solution to your problem without checking what they do. Not even once.
-
Merging one git branch into another when it conflicts an added line or function.
Like really? You can't handle ONE LINE being added?6 -
Is it okay for me to fork my own repo to an alt account so I can have my multi-branch repo but not have to commit everything to the production repo right away?10
-
Today I heard from a fellow worker: "Why this lot of conflict in this branch, the conflict that I have at home is enough".1
-
There was this guy at university who pronounced 'branch' like 'brunch'. It was so hilarious that my friends and I had to hold our laughter back.1
-
Trying to merge
A conflict was found, just small changes on both files
Trying to resolve
*A hour later*
Deleted the code form both branch, merged the branches and repushed the code to the merged branch.1 -
Attaching network card to a remote server is like cutting a branch sitting on it, If you are on the wrong side you will have a great fall :D2
-
That moment when your co-worker merges his branch and removes all of the work you have done for the last 7 hours, two minutes before clock out time...13
-
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 -
15 mins before the Production Release, after accidentally merging the Dev branch with the Master one :)2
-
Sneaking a JavaScript code to open Kung fu panda scadush scene on logout :D never actually got merged to main branch (nor I would allow it) but got all the team giggling
-
Would you guys be interested in a text editor saving system like in skyrim/fallout ? f5 saves current code by creating a new branch, f9 discards the branch and goes back to previous code and maybe f8 to merge.1
-
Got branches:
+ More organised
+ Easier to work on lots of features
+ Easier to collaborate
- Commits don’t show in github contributions
Result: no branches1 -
i am switching jobs like a monkey switches trees. I never leave a branch before I grab the other one.1
-
Question: I completed a feature on separate branch. Since I'm not allowed to merge things on the master branch (only pm is allowed to) I open a pull request.
However, PM has decided that he will only accept PRs which can be automatically rebased & merged.
So now i opened my PR and PM says that GitHub complains that the branches cannot be automatically merged.
So I rebase the branch - push and tell him to try again. But the same issue - GitHub won't merge the PR. So I try again - rebase the feature branch onto master which runs me through the same rebase steps as on the last try. I successfully complete this one too and push. But still - GitHub won't swallow the PR.
Anybody an idea what could've went wrong here?6 -
When you use Git for the first time and your project from 29 commit jump to 62 for continous error with Pull Request.
Of this new 33 commit, only 3 are REAL commit.
Four hour for reset and fix all The master branch.
But finally all is fixed and i've learned more on Git... (?)2 -
When I do SSH to a remote server, how can I show git branch name?
When I SSH it shows me this:
admin@123.456.789.555:/home/some_folder$
Can I configure it to show something like oh-my-zsh that shows me the current Git branch I am pointed to?
This is my local iTerm zsh default theme:
some_folder git:(feature/some_branch_name)24 -
First time I use Travis CI today :D
(And my first build error ever...)
In combination with Nuxt.js it is so fucking useful for Vue Development. Wow!
I think I've found my new favourite JS Framework.
Had a bit of trouble with Github Pages but I just created a 'source' branch with the source code and a 'master' branch with the deployed site. The reason is that organization sites can only be published from 'master' branch for some reason...
Anyways Travis CI is very useful!3 -
Current deploy process on the legacy project I'm on right now: ssh to server, check out branch with new feature, test on live, if it works then merge to master and check out master.
Oh... Oh no... -
Think I'm gonna branch out from dev for a minute and try my hand mucking about with my arduino kit! Any cool ideas guys? Robot Arm seems to be my prevailing will so far4
-
Me: Never check in code on Friday...
Me: Comes to work on Monday...
Me: WTF changed on Friday???
Always check-in at the end of each day on the dev branch! -
One day i do some code at home and i commit it ... Back to my office i realise its not my last version of my branch ... Fml ... Git push1
-
Absolutely hate it when my software engineering module project mate merge their own commits into the team repo without anyone else reviewing.
That’s it for you, branch protection ON. One more time and you’re losing push access -
¿Does it really takes that long to merge a branch when there is a conflict?
My "PM" takes like 20 minutes to fucking merge a branch that has a few lines of conflict... and I fucking hate to wait so long to continue on a ticket where I need previous work... I'm a JR full stack developer and I'm new to devRant... It was love at first sight.1 -
Not the biggest hurdle, but I felt like THE BOSS on finishing the task.
I have to create Branch in a repository for respective folders in S3 bucket and have to commit that folder into it's respective branch. There are around 29 folders in the bucket, the task would have taken my entire day. Rather I completed the task in less than half an hour. Shell Script is the coolest tool, which saved my entire day, indeed I felt like THE BOSS. -
Why eclipse?
Why did you think that implementing git yourself was a good idea?
Why? Fucking why?
Now when I switch to my development branch and it's a few commits behind I get lock fails when I fetch. And when I pull?
I'm fucking 32 commits in front of the branch? Like what the Fuck eclipse?
How can you pull those commits from the repo without fetching?
... I use the command like now.3 -
>add new feature, push to seperate branch
>ask other dev to have a look at code
>other dev completely rewrites the feature and pushes directly to master
please1 -
Git cherry-pick 35 commits, another dev commit to the wrong branch, and these commits will be released first
-
To branch or not to branch? (in developing software multiple features, releases...) (git)
I've been searching a lot of posts and info on the internet ( http://bit.ly/2kBLcar http://bit.ly/197szRP ). In summary, some people say it is better to branch and others the opposite. What do you think?
My conclusion was: let's branch but let's merge periodically to minimize merge conflicts.1 -
When a major bug fixad recently by you reappears on production environment 'cause someone else (not you of course...) merged old branch content to live branch...
-
Every bloody time I work on a ticket and am about to be done... "git commit -av" Looking at the branch... Bloody hell, I am working again in master... Aborting commit. Checkout -b to a new branch... Committing... Going back to master... Merging my new branch into master... This exercise seems so pointless.
-
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 -
My heart was still full of excitement when my branch was merge in develop branch without any comment. 🤩🤩🤩
-
After three months of development, my first contribution to the client is going live on their servers in less than 12 hours. And let me say, I shall never again be doing that much programming in one go, because the last week and a half has been a nightmare... Where to begin...
So last Monday, my code passed to our testing servers, for QA to review and give its seal of approval. But the server was acting up and wouldn't let us do much, giving us tons of timeouts and other errors, so we reported it to the sysadmin and had to put off the testing.
Now that's all fine and dandy, but last Wednesday we had to prepare the release for 4 days of regression testing on our staging servers, which meant that by Wednesday night the code had to be greenlight by QA. Tuesday the sysadmin was unable to check the problem on our testing servers, so we had to wait to Wednesday.
Wednesday comes along, I'm patching a couple things I saw, and around lunch time we deploy to the testing servers. I launch our fancy new Postman tests which pass in local, and I get a bunch of errors. Partially my codes fault, partially the testing env manipulating server responses and systems failing.
Fifteen minutes before I leave work on the day we have to leave everything ready to pass to staging, I find another bug, which is not really something I can ignore. My typing skills go to work as I'm hammering line after line of code out, trying to get it finished so we can deploy and test when I get home. Done just in time to catch the bus home...
So I get home. Run the tests. Still a couple failures due to the bug I tried to resolve. We ask for an extension till the following morning, thus delaying our deployment to staging. Eight hours later, at 1AM, after working a full 8 hours before, I push my code and leave it ready for deployment the following morning. Finally, everything works and we can get our code up to staging. Tests had to be modified to accommodate the shitty testing environment, but I'm happy that we're finally done there.
Staging server shits itself for half a day, so we end up doing regression tests a full day late, without a change in date for our upload to production (yay...).
We get to staging, I run my tests, all green, all working, so happy. I keep on working on other stuff, and the day that we were slated to upload to production, my coworkers find that throughout the development (which included a huge migration), code was removed which should not have. Team panics. Everyone is reviewing my commits (over a hundred commits) trying to see what we're missing that is required (especially legal requirements). Upload to production is delayed one day because of this. Ended up being one class missing, and a couple lines of code, which is my bad (but seriously, not bad considering I'm a Junior who was handed this project as his first task at his first job).
I swear to God, from here on out, one feature per branch and merge request. Never again shall I let this happen. I don't even know why it was allowed to happen, it breaks our branch policies. But ohel... I will now personally oppose crap like this too...
Now if you'll excuse me... I'm going to be highly unproductive and rest, because I might start balding otherwise after these weeks... -
That feeling when you upgraded an internally used library from TypeScript 1.8 to 2.5 getting rid of the typings dependency and fixed its bug highlighted by the upgrade and all tests are green -- that feeling would not be rantworthy.
Realizing on trying to publish the new version that the master branch is not the actual master branch but a branch called 0.3 is. Of course I cannot merge my changes back there.
I don't mind a different main branch name. Yet don't call it a version, that's what tags are for. And for all that's holy, please set the proper main branch in your bitbucket / GitHub / gitlab so that I can find out easily.
Now I've wasted half a day and if you're looking for me: I'm gone searching for the motivation of doing the same shit again for the "main" branch. -
Commit every change, all of them... Yes the "Forgot a ; " MUST be commit... Commit in the DEV branch... Because you aren't ready for the PRODUCTION branch... And backup every night after work...
-
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. -
When someone tells you they have created a new branch with name "thisisMyNewBranchPleasePullToBeUptodate....."
and u have to type it2 -
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
-
Building. Building C++ takes so damn long. Accidentally checked out a wrong branch? Well there goes 20 mins.
-
EVEN THOUGH YOU PUSHED 31 FEATURE BRANCHES YOU'RE WORKING ALONE ONE YOU KEEP PUSHING CHANGES TO THE MASTER BRANCH. MOTHER OF GOD! WHY!?!?!?!?1
-
True horror story: DIBOL software produced by an outsourced team with one SVN branch per customer.1
-
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
-
I just started learning Norwegian. Does anyone know how I can enable branch prediction in the compiler?2
-
Submodules in git.... every time you switch a branch on the main git repo the submodules end up going haywire2
-
"I'm gonna use your branch, you've done it better than we have it now"
https://i.imgflip.com/ggywy.jpg/...2 -
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. -
A: oh hey my commit is not in the master branch...
A: *seeing bunch of commit deleted activity in bitbucket by B
A: Lol B deleted commits in master branch
B: Wait, what?! I know I have rebased my branch.. but never have I rebased anything in the master branch.. how can this be *intense breathing
B: Are you sure you have pushed yours to master?
A: Sure I've rebased, squashed, and rbt landed my work to master, here look my local master has my commit
CTO: wait what? Is this related to this bug we have in production just now? Please don't panic, let us resolve it
Turns out rbt land just squash your commit to your local master branch and they thus A have not pushed it to the remote. And the bunch of commit deleted activity were bitbucket not informing from which branch the activity was happening. Almost gave us heart attack. -
PM: let's show customer the new feature while it's still in the develop branch
Me: no fucking way this could ever happen -
All day working on a new feature for a React application, on the bus thinking about how to continue working on it tomorrow (Saturday) just to realize that I didn't push my branch. :(2
-
Perforce just deleted all my work from yesterday and today. Apparently using the 'update branch mapping' feature is a bad idea3
-
Release build fails. Bad test was commented out on development branch but merged into release branch.
-
I committed one thing to the wrong branch half a year ago and now, when it's time to merge, the history doesn't make sense. It isn't actually a problem, but it really hurts to look at.
-
Convince the CEO of my small company to branch out to games because I am too inept to start a company of my own.2
-
Frustrated with solving the mess in master branch that cocky developers who don't understand git create.
-
What branching methodology do you use and why? We've been using a trunk based development model, but I'm reviewing others.10
-
Anyone aware of an extension for VSCode that can create a branch from a task/issue in GitHub or GitLab; similar to how IntelliJ tasks work?1
-
Those bugs that gets fixed by creating a new branch and doing the exact same changes there or even cherry-picking same commits there. Not the first time this happened to me :(
-
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 -
Mondays are for branch cleanup! It's gotten a *little* out of hand...anyone else this unorganized from time to time?
1 -
Somewhere Between Development Branch And Production Branch, We all grew up!
#Also_This_Camel_Casing_Shit_Doesnt_Leave_My_Hands -
When a junior developer forks new feature branch from his old feature branch and not from develop branch causing merge conflicts later!1
-
Was thinking of some missing features for everyone's favorite source control software:
git blame problems --all
git wtf this_branch
git just_do_it_ffs
git just_fkin_merge_it branch
git abort --mylife -
Got flow idea : spawn 1 docker instance for each feature branch so the testing team can test each feature in isolation. Good idea or not?1
-
Had a new dev take us to merge conflict hell due to rebasing... we have meeting saying we are going to do git flow.....
manager who agreed makes branch project/releaseName based off of develop only to have us mr to that branch to then mr back to develop....
Had massive conflicts mr into that branch (i kept up to develop) and then had conflicts mr that branch to develop........ on a sunday night... great2 -
How to set the up a stagging environment for a github branch in heroku.
Lets say i have a master branch and a dev branch. All the changes and updates first pushed to dev branch and after successful review and test in goes to master branch.
But the issue is as i'm following the gitflow of keeping the master branch always deployable.since my heroku app is linked to the master branch, when i try to test the dev branch in production environment of heroku,sometimes it breaks for some error.and at that time the sites goes down untill i redeploy the master branch as it's the stable version .So how do i test a branch in heroku production environment while also keeping the the site active with master branch. it that makes any sense 🤡 plz help3 -
getting tons of fucking merge conflicts on rebasing remote branch with current master because that mockerfucking code review is still pending
-
Area of focus: Volunteer computing
It's a facinating and beautiful branch of computer science, not known enough. I love working with it, hoping I can change the world. -
For a small team (<= 7 people) working on a self-managed Gitlab instance ('Starter' subscription), is it better if each user keeps a fork of the project they work on (working on other branch than master) or have everybody work on the same fork (still, different branches)?
Also, squash commits on branch merging, yes/no and why?4 -
Have a question about git rebase with android studio.
So I have a feature branch which I finished working on, I made a pull request to develop branch and now I see many conflicts because develop is few commits ahead.
In android studio I switched to my feature branch, then did a git rebase develop and resolved all conflicts. After conflicted files were fixed I did a git add conflicted_file and continued with git rebase --continue until the end.
Now everything is finished. I have a local feature branch that was rebased to current develop, and I resolved all conflicts.
Problem is when I do a git push to my remote feature branch, I get a merge conflict error conflict from android studio and now I have to solve all merge conflicts yet again for some reason.
What I am doing wrong?2 -
I have a git feature branch with my commits but also have merged the changes from the main branch to resolve merge conflicts before PR.
But now need to create a special release with just my changes.
So I think have to cherry pick all my commits on my branch some the last Release. How can I do that?
Develop (others) + Feature => Develop
Want to create new branch
Last Release + Feature (but only my commits since last Release)4 -
hey, how do you keep up with the migration files and git branches, i name them, how do you make sure the current branch has latest migration files so it does not break your application :)3
-
People complaining about people pushing to master branch directly: can't you actually protect master from force pushes and have each PR reviewed? Why is that so difficult to understand?3
-
I have to integrate Branch.io journeys to a React PWA. Just started reading the docs and got a basic idea.
Just confused about how shall I add the web SDK in the React way.
Also, any explanations, tips, things-I-should-beware about branch?
[that is, if anyone's happened to have heared of it] -
Anyone who has worked with travis-ci for building their python project git branch? Seems that my yml is not configured properly and don't know how to create one correctly. The current build error is attached. Any leads are helpful.
Ps: Have not pushed any unit test cases in this project
FYI: deliberately marked branch and stuff in astresik. you can assume it is correct.
4 -
Git questions: If several people have merged different features into a release branch but then some need to be "undone" how do you do it? I guess the merge/pull? Without being everything else?5
-
How to use git rebase when working with master and staging branch?
It might be a stupid question, but I really like the idea of creating a feature branch, work on it, if there are multiple commits squash them, rebase in top of master and then create a pull request from that branch to master.
It keeps the gut log pretty clean.
However, how would you do this, when not only working with a master branch but a staging/testing too?
Would you just rebase onto staging, merge to staging and when everything is fine, rebase onto master and merge again? Is there a netter way?6 -
Commenting and forgetting to delete before merging to master, only to create another branch just to delete these comments or put TODOs. 😑😑
-
VPN -> SSH -> git clone -> git branch -> sshfs pull -> edit-> restart VPN/SSH every hour or so when it goes down -> sshfs push -> git commit -> git push -> fml
-
Today I keep fixing bugs I didn't know existed instead of the bug I created my git branch for... So much:
$ git branch -m <bugNameNotFixed> <bugActuallyFixed> -
yeah sure, having all 5 devs only ever working directly on the production branch and not being allowed to save anything post-release unless it's an urgent bugfix sounds like a great idea
-
TFW your collegues rename and refactor everything, don't comment on their commits and then break EVERYTHING when you merge their changes into your branch. FFS.
-
God damn sourcetree.
You already annoy to use, now i have to deal with this stupid thing eat up my work
All my local commit in last 10 days, gone. because I just change from HEAD branch to master branch. WHY THE FCK YOU REMOVE IT.
GIVE ME BACK MY WORK!!!2 -
Next year I have to decide what branch I'll be studying , I am between computing and software , I like security too, ¿ any help ?7
-
I switched jobs and saw new office today. Also found out that this branch has 10 recruiters. This is outsourcing company, not recruiting company. Why the hell they need 10 recruiters in office that has capacity for 70 employees wtf...2
-
Merging two months of work from one SVN branch to another without touching the trunk. I now know what the 16th level of hell is.1
Top Tags
Weekly Rant
View