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
-
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?50 -
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 .. !!
😐😑😐😱😩😡9 -
https://git.kernel.org/…/ke…/... sure some of you are working on the patches already, if you are then lets connect cause, I am an ardent researcher for the same as of now.
So here it goes:
As soon as kernel page table isolation(KPTI) bug will be out of embargo, Whatsapp and FB will be flooded with over-night kernel "shikhuritee" experts who will share shitty advices non-stop.
1. The bug under embargo is a side channel attack, which exploits the fact that Intel chips come with speculative execution without proper isolation between user pages and kernel pages. Therefore, with careful scheduling and timing attack will reveal some information from kernel pages, while the code is running in user mode.
In easy terms, if you have a VPS, another person with VPS on same physical server may read memory being used by your VPS, which will result in unwanted data leakage. To make the matter worse, a malicious JS from innocent looking webpage might be (might be, because JS does not provide language constructs for such fine grained control; atleast none that I know as of now) able to read kernel pages, and pawn you real hard, real bad.
2. The bug comes from too much reliance on Tomasulo's algorithm for out-of-order instruction scheduling. It is not yet clear whether the bug can be fixed with a microcode update (and if not, Intel has to fix this in silicon itself). As far as I can dig, there is nothing that hints that this bug is fixable in microcode, which makes the matter much worse. Also according to my understanding a microcode update will be too trivial to fix this kind of a hardware bug.
3. A software-only remedy is possible, and that is being implemented by all major OSs (including our lovely Linux) in kernel space. The patch forces Translation Lookaside Buffer to flush if a context switch happens during a syscall (this is what I understand as of now). The benchmarks are suggesting that slowdown will be somewhere between 5%(best case)-30%(worst case).
4. Regarding point 3, syscalls don't matter much. Only thing that matters is how many times syscalls are called. For example, if you are using read() or write() on 8MB buffers, you won't have too much slowdown; but if you are calling same syscalls once per byte, a heavy performance penalty is guaranteed. All processes are which are I/O heavy are going to suffer (hostings and databases are two common examples).
5. The patch can be disabled in Linux by passing argument to kernel during boot; however it is not advised for pretty much obvious reasons.
6. For gamers: this is not going to affect games (because those are not I/O heavy)
Meltdown: "Meltdown" targeted on desktop chips can read kernel memory from L1D cache, Intel is only affected with this variant. Works on only Intel.
Spectre: Spectre is a hardware vulnerability with implementations of branch prediction that affects modern microprocessors with speculative execution, by allowing malicious processes access to the contents of other programs mapped memory. Works on all chips including Intel/ARM/AMD.
For updates refer the kernel tree: https://git.kernel.org/…/ke…/...
For further details and more chit-chats refer: https://lwn.net/SubscriberLink/...
~Cheers~
(Originally written by Adhokshaj Mishra, edited by me. )
23 -
The typical devRanter
1. Uses dark theme of IDE and devRant app
2. Hates his/her clients
3. Likes Arch based distros
4. Checks his/her ++'s count or notifications after publishing a rant
5. Hates facebook
6. Associate the morning with a cup of coffee
7. Can't do any job when there are no headphones
8. iPhone vs Android? - fuck, they both are good/bad
9. Every time googles git command to remove a local branch
10. The best VCS is git, but I never used any other VCS22 -
Fucking fuck fuck fucker fucking fuck
What a dumbass guy seriously. I have this colleague in my office who refuses to create a new branch because that will "ruin the single straight line". Are you seriously fucking kidding me??? The noobest guy ever doesnt know a third git command other than pulling and committing fucking nonsense. Why use git then? Just go back to creating zip files are maintain code. Fuck that guy too who hired him and now because of this fucking asshole I am not able to carry on my work.
Such so-called "developers" should be strapped to the back of a horse and the horse made to run on a gravel road for fuck's sake.. Fuck you man 🖕24 -
The collegue who I hang out with has resigned.. we together were known as the only Innovators of the project... Now suddenly My manager's behaviour towards has changed... He has started to treat me with real care as if Inam his son... 😂😂😂 The bastard is thinking I might resign as well 😏😏😏😏8
-
I wish we could branch out our lives like in git. Just fork at critical decision points, try out both/ multiple outcomes simultaneously, then reconcile and merge back into master.10
-
!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?30 -
The superpower to perform version control on reality. (Git)
Imagine this universe (the current branch), which is made up of a series of events (commits).
Having this ability to allows us to:
- undo events (git reset/git revert)
- reorder events (git rebase)
- transfer to another universe (git checkout)
- derive a new universe from current universe (git checkout -b)
- delete a universe (git branch -D)
- apply an event from another universe (git cherry-pick)
and my favorite:
- merge universes and their events (git merge)
we have to resolve conflicting events, of course.
What else? ;)8 -
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 -
There is SAS (Language)!
There is SAAS (Software as a Service) !!!
There is SASS ( Css Coding )!!!
😒
Next will be : SSAS !!!16 -
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
-
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 -
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 -
Our manager is not a developer and he has no idea of what we are doing most of the time, but he thinks that stand-up meetings are the coolest way to control us.
Sometimes coworkers joke about his lack of knowledge and today I think we reached the highest jerk level: «Yesterday I opened a new branch on the git repository and today I'll continue on this task».
I struggled to stay serious on my turn.11 -
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
-
User: Hi , I am facing some issues.
Tech Help: Please elaborate your issues.
User: My monitor's screen is flickering.
Tech Help: Please drop an email with the screenshot. We will get back to you later.
User: *Speechless*.6 -
Usually I do love my colleagues, but lately....
FOR FUCKS SAKE I AM NOT YOUR WALKING HUMAN GOOGLE SEARCH ENGINE SHITOVERFLOW CHATGEPETTO INSTANCE! READ YOUR FUCKING LOGS, DO A FUCKING INFORMATION LOOKUP, READ THE FUCKING MANUAL.
OH YOU HAVE A QUESTION YOU SAY? PLEASE FOR FUCK SAKE ELABORATE WITH SOMETHING MORE THEN 'Please help me with the pipeline"' WHILE YOUR ACTUAL PROBLEM IS A LACK OF KNOWLEDGE AND UNDERSTANDING OF GIT, LINUX OPERATING SYSTEMS AND AUTOMATION.
OH YOUR BRANCH IS, WHAT, 3 MONTHS BEHIND MASTER? NEVER HEARD OF A FUCKING REBASE? WHATS THAT YOU SAY??? YOU DONT KNOW WHEN TO SKIP A COMMIT??? ITS YOUR FUCKING CODEBASE! READ THE FUCKING DOCUMENTATION !!!
WHATS THAT? YOU WORK IN VSCODE AND YOU DO T K OW HOW? AGAIN READ THE FUCKING DOCUMENTATION !
Self.end(rant)11 -
Now, instead of shouting, I can just type "fuck"
The Fuck is a magnificent app that corrects errors in previous console commands.
inspired by a @liamosaur tweet
https://twitter.com/liamosaur/...
Some gems:
➜ apt-get install vim
E: Could not open lock file /var/lib/dpkg/lock - open (13: Permission denied)
E: Unable to lock the administration directory (/var/lib/dpkg/), are you root?
➜ fuck
sudo apt-get install vim [enter/↑/↓/ctrl+c]
[sudo] password for nvbn:
Reading package lists... Done
...
➜ git push
fatal: The current branch master has no upstream branch.
To push the current branch and set the remote as upstream, use
git push --set-upstream origin master
➜ fuck
git push --set-upstream origin master [enter/↑/↓/ctrl+c]
Counting objects: 9, done.
...
➜ puthon
No command 'puthon' found, did you mean:
Command 'python' from package 'python-minimal' (main)
Command 'python' from package 'python3' (main)
zsh: command not found: puthon
➜ fuck
python [enter/↑/↓/ctrl+c]
Python 3.4.2 (default, Oct 8 2014, 13:08:17)
...
➜ git brnch
git: 'brnch' is not a git command. See 'git --help'.
Did you mean this?
branch
➜ fuck
git branch [enter/↑/↓/ctrl+c]
* master
➜ lein rpl
'rpl' is not a task. See 'lein help'.
Did you mean this?
repl
➜ fuck
lein repl [enter/↑/↓/ctrl+c]
nREPL server started on port 54848 on host 127.0.0.1 - nrepl://127.0.0.1:54848
REPL-y 0.3.1
...
Get fuckked at
https://github.com/nvbn/thefuck
10 -
Writing more infrastructure than product.
Look, my application requests and transforms data from a single external API endpoint, it's just one GET request...
But I made an intelligent response caching middleware to prevent downtime when the parent API goes down, I made mocks and tests for everything, the documentation is directly generated from the code and automatically hosted for every git branch using hooks, responses are translated into JSONschema notation which automatically generate integration tests on commit, and the transformations are set up as a modular collection of composable higher order lenses!
Boss: Please use less amphetamine.5 -
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 -
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 -
Have guys ever thought that all te devs are vampires...
reason 1: Loves Darkness (dark theme)
reason 2: Most active during the night
reason 3: If the dev finds a capable victim then they can make them fellow dev.25 -
I am a tester by profession, But I love coding. Sadly my organisation doesn't allow people of my profile to install IDE/ Programming softwares... So I had to work with what I had... VBA, MS Office...
I started to work on few small Ideas, then I and a friend worked on a macro which automates a 5 year old manual process... It became a Hit ! It changed the whole process... My manager started to highlight it everywhere... Other manager started to come to us for helps....
So I learnt MS Excel Vba, then MS Access vba... started to become an expert...
Now the whole onshore and offshore management knows us by name....
This excitement made me explore other programming language band fell in love with Python and JavaScript...
Now I made a virtual bot for my manager....
That small project paved the whole way of my programming passion...4 -
When you accidentally commit and push under the wrong branch and the wrong branch in question is master.
6 -
Let the student use their own laptops. Even buy them one instead of having computers on site that no one uses for coding but only for some multiple choice tests and to browse Facebook.
Teach them 10 finger typing. (Don't be too strict and allow for personal preferences.)
Teach them text navigation and editing shortcuts. They should be able to scroll per page, jump to the beginning or end of the line or jump word by word. (I am not talking vi bindings or emacs magic.) And no, key repeat is an antifeature.
Teach them VCS before their first group assignment. Let's be honest, VCS means git nowadays. Yet teach them git != GitHub.
Teach git through the command line. They are allowed to use a gui once they aren't afraid to resolve a merge conflict or to rebase their feature branch against master. Just committing and pushing is not enough.
Teach them test-driven development ASAP. You can even give them assignments with a codebase of failing tests and their job is to make them pass in the beginning. Later require them to write tests themselves.
Don't teach the language, teach concepts. (No, if else and for loops aren't concepts you god-damn amateur! That's just syntax!)
When teaching object oriented programming, I'd smack you if do inane examples with vehicles, cars, bikes and a Mercedes Benz. Or animal, cat and dog for that matter. (I came from a self-taught imperative background. Those examples obfuscate more than they help.) Also, inheritance is overrated in oop teachings.
Functional programming concepts should be taught earlier as its concepts of avoiding side effects and pure functions can benefit even oop code bases. (Also great way to introduce testing, as pure functions take certain inputs and produce one output.)
Focus on one language in the beginning, it need not be Java, but don't confuse students with Java, Python and Ruby in their first year. (Bonus point if the language supports both oop and functional programming.)
And for the love of gawd: let them have a strictly typed language. Why would you teach with JavaScript!?
Use industry standards. Notepad, atom and eclipse might be open source and free; yet JetBrains community editions still best them.
For grades, don't your dare demand for them to write code on paper. (Pseudocode is fine.)
Don't let your students play compiler in their heads. It's not their job to know exactly what exception will be thrown by your contrived example. That's the compilers job to complain about. Rather teach them how to find solutions to these errors.
Teach them advanced google searches.
Teach them how to write a issue for a library on GitHub and similar sites.
Teach them how to ask a good stackoverflow question :>6 -
TFW your client's git policies are so draconian that the dev teams use "develop" as trunk, and completely ignore the release process.
I wrote up 50 pages of git standards, documentation and procedure for a client. Bad indian director 9000 decides the admin (also Indian) who specializes in Clearcase and has no git or development experience is more qualified to decide and let's him set the policy.
FF to today:
- documentation, mostly contradictory, is copy pasted from the atlassian wiki
- source tree is the standard
- no force pushing of any branches, including work branches
- no ff-merge
- no rebasing allowed
- no ssh, because he couldn't figure it out...errr it's "insecure"
- all repos have random abbreviated names that are unintelligible
- gitflow, but with pull requests and no trust
- only project managers can delete a branch
- long lived feature branches
- only projects managers can conduct code reviews
- hotfixes must be based off develop
- hotfixes must go in the normal release cycle
- releases involve creating a ticket to have an admin create a release branch from your branch, creating a second ticket to stage the PR, a third ticket to review the PR (because only admins can approve release PRs), and a fourth ticket to merge it in
- rollbacks require director signoff
- at the end of each project the repo must be handed to the admin on a burned CD for "archiving"
And so no one actually uses the official release process, and just does releases out of dev. If you're wondering if IBM sucks, the answer is more than you can possibly imagine.11 -
I had to explain what version control was to the dinosaur last week. (Our cto, for more context check last post)
So we've been having issues getting our infrastructure dude to do deployment because he is sick of the treatment he gets here and has basically checked out.
Deployments then fell onto the dinosaur. After struggling for an eternity to figure out app settings (any junior dev could figure this out) he finally deployed, however it was from qa branch.
I gently reminded him that we were deploying from master and that all changes in qa should be merged to master when testing phase is over.
He informed me that 'he doesn't think that's a good idea because if we merge to master and there's problems then it's fucked forever and there is nothing we can do'
I stood there with my mouth hanging ajar until I finally managed to squeeze out 'that's literally what git is for....' 🤡3 -
A : "what the funk is wrong with git ! why there are conflict!!"
Y: "let me see, hmm .. just press ctrl + disc.."
A : "what are you doing ?"
Y : "discard! they are gone. now you can try again in different branch"
A : "I didn't commit !! this my work of two weeks!!!"
Y : " ..... "
Y : *sneak away*7 -
Boss: Can you modify the prototype, so that I can show it off to the customers who will visit?
Me: Sure, when do you need it?
Boss: In two hours.
Lesson learned: Always have a branch in your git with a working demo.7 -
!rant.
Here's some useful git tricks. Use with care and remember to be careful to only rewrite history when noones looking.
- git rebase: powerful history rewriting. Combine commits, delete commits, reorder commits, etc.
- git reflog: unfuck yourself. Move back to where you were even if where you were was destroyed by rebasing or deleting. Git never deletes commits that you've seen within at least the last 50 HEAD changes, and not at all until a GC happens, so you can save yourself quite often.
- git cherry-pick: steal a commit into another branch. Useful for pulling things out of larger changesets.
- git worktree: checkout a different branch into a different folder using the same git repository.
- git fetch: get latest commits and origin HEADs without impacting local braches.
- git push --force-with-lease: force push without overwriting other's changes5 -
$ git push
> current branch is behind
$ git push -f
... 5mins later coworker is asking why his commits have disappeared.6 -
I was about to ask my manager to roll me out off the project in my company.. it has been 4 years .... Yesterday he came and told me he is going to give me an big fat Raise !3
-
Github Inc. (Feel good inc. parody)
=========================
Ha-ha-ha-ha-ha-ha-ha-ha-ha-ha-ha-ha-ha.
Github.
Fetch it, fetch it, fetch it, Github.
Fetch it, fetch it, fetch it, Github.
Fetch it, fetch it, fetch it, Github.
Fetch it, fetch it, fetch it, Github.
Fetch it, fetch it, fetch it, Github.
Fetch it, fetch it, fetch it, Github.
(change) Fetch it (change), Fetch it (change), Fetch it (change), Github
(change) fetch it (change), fetch it (change), fetch it (change), Github
Repos breaking down on pull request
Juniors have to go cause they don't know wack
So while you filling the commits and showing branch trees
You won't get paid cause it's all damn free
You set a new linter and a new phenomenal style
Hoping the new code will make you smile
But all you wanna have is a nice long sleep.
But your screams they'll keep you awake cause you don't get no sleep no.
git-blame, git-blame on this line
What the f*ck is wrong with that
Take it all and recompile
It is taking too lonnng
This code is better. This code is free
Let's clone this repo you and me.
git-blame, git-blame on this line
Is everybody in?
Laughing at the class past, fast CRUD
Testing them up for test cracks.
Star the repos at the start
It's my portfolio falling apart.
Shit, I'm forking in the code of this here.
Compile, breaking up this shit this y*er.
Watch me as I navigate.
Ha-ha-ha-ha-ha-ha.
Yo, this repo is Ghost Town
It's pulled down
With no clowns
You're in the sh*t
Gon' bite the dust
Can't nag with us
With no push
You kill the git
So don't stop, git it, git it, git it
Until you're the maintainers
And watch me criticize you now
Ha-ha-ha-ha-ha.
Break it, break it, break it, Github.
Break it, break it, break it, Github.
Break it, break it, break it, Github.
Break it, break it, break it, Github.
git-blame, git-blame on this line
What the f*ck is wrong with that
Take it all and recompile
It is taking too lonnng
This code is better. This code is free
Let's clone this repo you and me.
git-blame, git-blame on this line
Is everybody in?
Don't stop, shit it, git it.
See how your team updates it
Steady, watch me navigate
Aha-ha-ha-ha-ha.
Don't stop, shit it, git it.
Peep at updates and reconvert it
Steady, watch me git reset now
Aha-ha-ha-ha-ha.
Github.
Push it, push it, push it, Github.
Push it, push it, push it, Github.
Push it, push it, push it, Github.
Push it, push it, push it, Github.2 -
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 xD8 -
Commit Message Part2:
6528fff Code was clean until manager requested to fuck it up
241b35f Who knows WTF?!
4381a32 Argh! About to give up :(
c3bf1a9 more debug... who overwrote!
2d68d6d Fixed a bug cause Maciej said to
b112c1a This branch is so dirty, even your mom can't clean it.
bb456d4 Shit code!
4878b46 Copy-paste to fix previous copy-paste
e2c7e87 A fix I believe, not like I tested or anything
f56109f derpherp
e4b8f4c formatted all
3691208 I'm just a grunt. Don't blame me for this awful PoS.
0888b69 just checking if git is working properly...
62741aa I'm too old for this shit!
0735196 COMMIT ALL THE FILES!
09caccf I CAN HAZ PYTHON, I CAN HAZ INDENTS
1e1cda8 giggle.
ab70bde Fixed errors
934436d Now added delete for real
5f84e30 My bad
99baff8 CHRIS, WE WENT OVER THIS. C++ IO SUCKS.
953473d final commit.
f0c3b57 Just committing so I can go home
4e5ce4e yolo push
deb4e3b I CAN HAZ PYTHON, I CAN HAZ INDENTS
710c06a Commit committed....
3c45e67 it is hump day _^_
4487788 Committing in accordance with the prophecy.
bf86e7e This solves it.
4804f68 FONDLED THE CODE
051d42e REALLY FUCKING FIXED5 -
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 -
Automated a process which was being perfomed manually for 5 years !
Client is so happy comes up with more stuffs to automate.1 -
1. Slack. Pretty good chat app for dev companies, I use it to prevent people standing next to my desk 40 times a day.
2. Unit testing tools, especially when fully automated using a git master branch hook, something like codeship/jenkins, and a deployment service.
3. Jetbrains IDEs. I love Vim, but Jetbrains makes theming, autocompleting & code style checks with mixed templating languages a breeze.
4. Urxvt terminal. It's a bit of work at the start, but so extremely fast and customizable.
5. Cinnamon or i3. Not really dev tools, but both make it easy to organize many windows.
6. A smart production bug logger. I tend to use Bugsnag, Rollbar or Sentry.
7. A good coffee machine. Preferably some high pressure espresso maker which costs more than the CEO's car, using organic fairtrade hipster beans with a picture of a laughing south american farmer. And don't you dare fuck it up with sugar.
8. Some high quality bars of chocolate. Not to consume yourself, but to offer to coworkers while they wait for you to fix a broken deploy. The importance of office politics is not to be underestimated.1 -
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.8 -
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 developer7 -
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.11 -
"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 -
```
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.10 -
Assigned to a new project team..
Using git, in a creative way. So.. "master" is "dev" branch, usually. Everyone can push their branch to dev server .. so it's "dynamic for us". Production branch is whatever, as long as the branch has the release version. Sometimes, the release comes from "master".. that mean "dev" in normal geek..
That's just Git. The source code is a saturated spagetti of Entity framework and Caliburn. It is littered with antipatterns, especially basebean. Holy Christmas and Easter that baseclass do a lot of stuff that has no place as a base class ..
Fucking frameworks, I'm gonna start to evangelize frameworks as the no1 antipattern.
MS SQL as the main DB, but is dumped to json FILES through a scheduled task to increase read performance on web.
There is a soap endpoint to expose the json files, fml..
I am assuming I was placed here to improve stuff, I have never in my life seen anything like this before.
There is a special place in hell for this repository7 -
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 -
Renaming your master branch to "main" is racist. When Git was created, there were no connotations related to slavery. Also, the word "master" has many meanings, and in the context of computer technology, "master" has nothing to do with slavery.
When I tell that to people, some of them say "but wait, you're white, so you by definition can't understand feelings of black people".
Feelings come from one's mind. Proposing the situation where I can't understand something because "only black people understand it" implies white and black people being different in their cognitive abilities, and that's fucking racism right there.
Ability to understand cultural and historical phenomena does not depend on race. Anyone who says that without a biological proof is a racist.
I find it ironic how it's microsoft who almost enforced this on GitHub while themselves supporting literal concentration camps: https://github.com/drop-ice56 -
When you live in a 3rd world country, get a relatively expensive 16mbps connection (that's still very unreliable), and try to clone WebKit… why the hell is it so large even with `--depth 1` and `--single-branch`? Why doesn't `git clone` support resuming/incremental cloning? Is this even 2018?
I want to code but life is actively fighting me right now. I hate this.
/rant
26 -
My progression of learning git rebase:
Year 1: WTF just happened?! Where is my code?! *deletes and re-clones repo*
Year 2: Ok if I do it suuuper carefully I can get the other dev's one-line change into my branch...shit...shit...wait...fuck...oh lol it worked.
Year 3: Oh yeah let me organize my commits real quick. *drop pick pick squash reword pick fixup drop pick* *git push -f* 😎7 -
a tale of daily frustration:
git fetch
*yup I'm up-to-date ...*
git add -p .
*hack in beautiful patch ...*
git status -bs
*correct branch, didn't forget any files ...*
git diff --cached
*yep, that is what I mean to commit ...*
git commit -m"[TKT-NUM] Meaningful commit message"
git log -p -1
*double-checking ... looks good ...*
git push remote tkt-num-etc
*for a brief moment feel accomplished ...*
*notice typo in commit message ...*
I don't have a funny image or punchline to sum this post up. But know that if you recognise this feeling, then I am your brother in git.6 -
The fucking hubris on some people... If you don't understand git, in a shop that uses git, how in the name of fucking odin's nutsack do you think you're qualified to be a senior dev? I'm not talking understanding the internals of git, I'm talking knowing WTF a branch even is! Oh, I know, its because you eat lunch with the bossman! Cronyisn is alive and well folks! Now I gotta fix all this shit, or its my fault...3
-
Story of WTF happened to my job
During my employment in (name censored) was stressful, They claimed I didn't complete my task on time which they constantly remove me from git and documentation(which have to follow their style of returning data), I kept emailing, slack, WhatsApp calls them, mostly and predictably got ghosted and blocked.
So How the fuck am I supposed to push my code or code without the documentation (I can actually, prevent refactoring every time, following the documentation is the good way to go.)
On the sprint review, they will complain about me not committing and pushing the code. (I did commit locally, but can't push, they removed me from the fucking repo) and not done.
Tried reasoning, telling the obvious reasons with them, doesn't work. They come out the second reason of me "NOT COMMUNICATING". Sometimes I can get to git merge from dev to my branch and get tonnes of fucked up code. I reviewed the code, and I can't tolerate it.
Lately, I overheard them mocking and cheering me about to get fired over a zoom meeting (I was in there, they forgot to remove me). Their conversation is about me being a coloniser, a jerk, betraying Chinese ancestors for being not Chinese enough.
I was like: "Why the fuck does their conversation sound like they are tucked in the Qin dynasty?"
Frequently I got labelled as unprofessional.
How is cussing about my ancestors, personal and life a professional behaviour?16 -
Forgot to push to stable branch before I left from work. Nightly build takes 5 hours so I needed to do that in order to get nightly in the morning. As I'm moving I have only cellphone with 16k internet at home. Sounded like I'm screwed. But luckily fetching few new commits and pushing them back to correct branch git managed even over this parody of internet connection. Love git, I'm saved. Whole repo has few hundred megs, if I had to download everything it would be faster to wait to get real internet connection in few days.1
-
I just dropped my office laptop !
😨😨😨😨
There is a crack on the corner of the body but the device is Ok !
I am worried they will charge me the whole cost of the laptop ( i.e. 3 months worth salary )19 -
Please, stop being afraid of git rebase.
Please stop merging master branch into feature branch just to fix pull request conflicts.2 -
Me: How can I delete pushed commits from origin?
Colleague: Just do git reset --hard and then git push -f
Me: But this is dangerous
Colleague: Wait, I'll do it myself
Colleague: Done
Me: But nothing happened
Colleague: Fuck. I just removed all changes on my own branch
2 -
Introduced git in work about 5 months ago, explained to my coworkers how it works, shared links to tutorials, git pro book and everything imaginable.
Almost every day I learn something new ... they keep struggling to checkout a branch or resolve some simple conflict...
I'm just tired of explaining things...
Now I just go and fix every thing and learn a lot :)8 -
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 -
Init and Hello. My name is git and this is my story.
I just arrived in this system recently by the apt highway. It's not the only way though. Some for example used the npm hype-train, others arrived from the ssh shore. No matter where we came from the next step on our agenda was time to introduce our self at the event destined for all new-comers to the system.
"As many of you I reside in the usr-bin district. I'm really into history and commitment! I like it when people work together, so I'm always eager to bring all branches together."
"But what is it actually good for?", asked Curl, which I already met at the bus station. Many nodded in agreement. It was odd. Somehow I felt not quite at home. All the others seemed so different based on their field of work.
"We have worked here in a really agile environment for ages. There is no need for any kind of strange bureaucracy.", said another voice.
All attempts to convince them from the beauty of history or a little bit of management were unsuccessful. It was just the beginning of a not so interesting stage in my life - to say the least.
Today was another of 'those' days. I live in this community for quiet a while now and unfortunately nothing really changed - at least for the good. I sat on my branch of the tree with all the others around and there was nothing really to do for me. Again. I mean, actually it's true. I have to admit it. There is just no work on this world for someone like me. All the others seem to be so busy, while I just have to sit around and question my own existence. Since I grew tired asking these questions to myself, I stopped it. I can't do a thing actually. That's not how this world works.
"Hey fagit, anything meaningful to add to our delightful conversation?", nginx shouted over to me from another branch of the tree. Before I was able to give an indifferent answer the voice just continued.
"Oh, sorry. I forgot that you have no purpose after all. Well, never mind!"
Everyone started laughing at me. It was not too bad by the way. Actually, this was quite ordinary. These fucktards completely ran out of creativity. If it wasn't for that mere emptiness gaping right above my guts, I'd actually be disappointed. I even got accustomed to the alias 'fagit'. Quiet sad given the fact that i really like my real name. If only someone would mind using it... First too quiet to notice but growing in intensity a rumbling emerged from somewhere deep within the tree. Out of a sudden everyone stopped laughing. The voices slowly faded while the growling from afar grew louder. It had come. Not more than a shadow reached out from the tree and faster than anyone could comprehend nginx was simply gone. Killed in an instance.
Disclaimer: This story is fictional. No systems were harmed in its creation.4 -
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
-
So ive been messing around with my Google Home.. because having a voice activated weather station is cool and all, but as a developer it needs to be useful no?... and Raspberry Pi, cause you know, we cool kids have those sitting around doing nothing useful.
But back on track, getting these two to actually work together, and that almighty moment you can say "Hey Google, Deploy Project -X- to the Pi" and the Rpi just kicks into gear and pulls down the latest master branch from Gitlab for the correct project is mind boggling.
No more ssh + sudo git pull !!!
Disclaimer: i didn't pay for that Google Home, but its in my house, listening to my TV, so i may as well use the damn thing.1 -
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`.
4 -
We're no strangers to code
You know the conventions and so do I
A full commit is what I'm thinking of
You wouldn't get this from any other dev
I just want to tell you about my problem
Gotta make you solve it for me
Never gonna git you up, never pull you down
Never gonna rant around and rebase you
Never gonna merge your branch, never gonna say $#@*!!
Never gonna risk a cry and build you2 -
My company’s code base is so messy that the dev branch and master branch is so buggy. But they put the blame on me as usual.
I use git blame, I wasn’t the author .7 -
Boss is also a programmer which is nice. boss is also incredibly impatient. so when he gives me a project to do, when I don't have it done the day of, he goes and does it over the weekend. but he doesn't tell until a few days later when I finish the following Tuesday. he chucked my git branch and just pushed his stuff to master. then he belittled me because there was a feature missing in his code and I hadn't done it yet. I don't know how to deal with this. on the one hand, I could try and work faster. but on the other, I am trying to add features to software he wrote in c-style c++, didn't comment, and hasn't been updated to modern standards since 1998. even the copyright files are 1997 to 2001. just very discouraged as its my first job in the field. it wouldn't have been so frustrating if he had just told me he'd worked on it himself instead of letting me finish it and then throwing it in the trash.
end rant8 -
How could I only name one favorite dev tool? There are a *lot* I could not live without anymore.
# httpie
I have to talk to external API a lot and curl is painful to use. HTTPie is super human friendly and helps bootstrapping or testing calls to unknown endpoints.
https://httpie.org/
# jq
grep|sed|awk for for json documents. So powerful, so handy. I have to google the specific syntax a lot, but when you have it working, it works like a charm.
https://stedolan.github.io/jq/
# ag-silversearcher
Finding strings in projects has never been easier. It's fast, it has meaningful defaults (no results from vendors and .git directories) and powerful options.
https://github.com/ggreer/...
# git
Lifesaver. Nough said.
And tweak your command line to show the current branch and git to have tab-completion.
# Jetbrains flavored IDE
No matter if the flavor is phpstorm, intellij, webstorm or pycharm, these IDE are really worth their money and have saved me so much time and keystrokes, it's totally awesome. It also has an amazing plugin ecosystem, I adore the symfony and vim-idea plugin.
# vim
Strong learning curve, it really pays off in the end and I still consider myself novice user.
# vimium
Chrome plugin to browse the web with vi keybindings.
https://github.com/philc/vimium
# bash completion
Enable it. Tab-increase your productivity.
# Docker / docker-compose
Even if you aren't pushing docker images to production, having a dockerfile re-creating the live server is such an ease to setup and bootstrapping the development process has been a joy in the process. Virtual machines are slow and take away lot of space. If you can, use alpine-based images as a starting point, reuse the offical one on dockerhub for common applications, and keep them simple.
# ...
I will post this now and then regret not naming all the tools I didn't mention. -
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 -
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.5 -
I try and try and try to teach my coworker critical thinking skills, proper programming techniques, and standard git etiquette. Then I add 4 booleans to solve one problem, use strings instead of ints to find unique SQL Server entities, and push right to the development branch.
I am a real asshole, but at least I am not fake.4 -
Software Engineering in future is just "Framework of frameworks" or one could say.. "Library of Libraries"...2
-
So to start off, I am a hipster. Guilty as charged. A few months ago.
Me and my work's programming team decided to enter a hackathon. Note, I had never stayed awake for 48 hours straight programming before.
It was late and I was waiting on programmer 1 to finish writing a class so I can finish a part of the network code. We were all working on the same git repository, same branch for some reason at the time.
So I started just writing in random comments in the code while waiting. I finally got to complete the network and committed my work.
They both made a pull about the same time and both my boss and coworker turned around at the same time.
I had written a comment
// Ya know those glasses I wear to work everyday? They're not prescription. They're fake.
The look of disappointment just staring me down was absolutely priceless. And the fact that they both read the comment at the same time.. 😂😂😂😂😂😂😂 -
Its been less than a month i joined this awesome community.
Like it was built for guys like me who love to code/develop.
Thanks @dfox and @trogus. !!!7 -
Today the Git for Windows updater asked if I wanted to let Git decide on the naming of my default branch... Hell no snowflakes!17
-
I'm the git expert at my work. This means every time someone has the slightest issue with git (or the git features in their ide), I get interrupted.
😡😡😡
Also I will say it is fascinating watching people who've used centralised version control all their lives struggle with distributed.
"Do you have my changes? I merged them into your branch..."
"You can commit and not push?!"9 -
It finally happened. One of our junior devs pushed a secrets file to their git branch and now I have to reset ALL THEIR CREDENTIALS. "git add ." will be the death of me.19
-
So I am conducting an introductory seminar on git and GitHub for juniors and as per my knowledge I've drafted this outline, please add your inputs..
The seminar will be of 1 day only
1. Install and configure Git and Github
2. Digital Signature mapping
3. Git init
4. New Project with HTML
5. Configure remote (git remote add <origin> <url>) ends with .git
6. Git commit (git commit –m “Title” –m “commit message”)
7. Pushing git push (git remote push origin master)
8. Git commit –amend
9. Git pull (git pull origin master)
10. Git checkout (git checkout –b new_branch_name)
11. Do some changes
12. Git push new branch (git remote push origin new_branch_name)
13. Git switch branch (git checkout <name_of_existing_branch>)
14. Pull requests
15. Git log (git log –oneline –graph)15 -
Annoys me so much how obviously lazy my department has been with one of its products. We have an iPad app that does document management and eForms and stuff. Its not perfect but not the worst. Then they decide they need to build an app to handle a specific kind of eForm. They just went "well this app already does eForms so lets just adapt it".
Worst. Decision. Ever.
the app is simply a branch off the original app. despite being a completely different product which isnt even concerned with the same business objects. it has been hacked until it does what it needs to. And i have to somehow maintain this trainwreck.
As a result we have a branch in our main Git repo that contains a completely different product, which is basically an iOS wrapper for an HTML eForm with ~5000 lines of jQuery to further hack on the functionality that the eForm provides.
And they wonder why iOS developers have been leaving and some keep threatening to leave. Even the Delivery Manager wants us to just do what is needed and get it out the door and never look at it again. How are we supposed to care when thats the attitude of the people who are supposed to be invested in it. Im surprised the client hasnt told us to get lost the app is so hideously broken and unmaintainable. Performing an action on the form can break a completely unrelated section somewhere else. We have lost control.
And they just keep adding more scope, ignoring our concerns cos hey its too late to just start changing the whole approach of the solution. -
Quick maffs:
git checkout -
will switch to a branch you previously checked out. So you can quickly switch between branches8 -
Accidentally rm -rf a git repo, one of the branch still not pushed to remote yet. I managed to use file recovery software to recover the .git folder, any idea what to do next?27
-
Thank you, GIT. Thank you. Your reflog saved work of months after someone deleted the wrong branch.1
-
I just noticed visualizing git is like a timeline with alternate realities and a lot of time travel. The main branch is the main timeline and the branches are like fixes from the past to try and make the future better they merge when the future is fixed otherwise if someone or something fucked up time traveling it becomes the main timeline.
-
Aaaa stop this issue with renaming everything furcubimofawasggkdjgdkkf whitelist blacklist git blame and the master of em all, the main branch3
-
What is the condition to join two tables ?
Programmer: primary keys match.
Non-Programmer: The tables height must match.😐1 -
When you make a mistake and try to fix it, but you can't remember how to spell amend...
git commit --ammend
error: unknown command `amend'
git commit -ammend
[branch-name] mend
Huh?
git log
commit #
mend
Created a new commit with message 'mend'. Now to clean this all up and go get some sleep!2 -
[See image]
This guy is wrong in so many ways.
"Windows/macOS is the best choice for the average user. Prove me wrong."
There are actually many Gnu/Linux based operating systems that's really easy to install and use. For example Debian/any Debian based OS.
There are avarage users that use a Gnu/Linux based operating system because guess what. They think its better and it is.
Lets do a little comparision shall we.
- - - - - Windows 10 - - Debian
Cost $139 Free
Spyware Yes. No
Freedom Limited. A lot
"[Windows] It's easy to set up, easy to use and has all the software you could possibly want. And it gets the job done. What more do you need? I don't see any reason for the average joe to use it. [Linux]"
Well as I said earlier, there are Gnu/Linux based operating systems thats easy to set up too.
And by "[Windows] has all the software you could possibly want." I guess you mean that you can download all software you could possibly want because having every single piece of software (even the ones you dont need or use) on your computer is extremely space inefficient.
"Linux is far from being mainstream, I doubt it's ever gonna happen, in fact"
Yes, Linux isn't mainstream but by the increasing number of people getting to know about Linux it eventually will be mainstream.
"[Linux is] Unusable for non-developers, non-geeks.
Depends heavily on what Gnu/Linux based operating system youre on. If youre on Ubuntu, no. If youre on Arch, yes. Just dont blame Linux for it.
"Lots of usability problems, lots of elitism, lots of deniers ("works for me", "you just don't use it right", "Just git-pull the -latest branch, recompile, mess with 12 conf files and it should work")"
That depends totally on what you're trying to. As the many in the Linux community is open source contributors, the support around open source software is huge and if you have a problem then you can get a genuine answer from someone.
"Linux is a hobby OS because you literally need to make it your 'hobby' to just to figure out how the damn thing works."
First of all, Linux isnt a OS, its a kernel. Second, no you dont. You dont have to know how it works. If you do, yes it can take a while but you dont have to.
"Linux sucks and will never break into the computer market because Linux still struggles with very basic tasks."
Ever heard of System76? What basic tasks does Linux struggle with? I call bullshit.
"It should be possible to configure pretty much everything via GUI (in the end Windows and macOS allow this) which is still not a case for some situations and operations."
Most things is possible to configure via a GUI and if it isnt, use the terminal. Its not so hard
https://boards.4chan.org/g/thread/...
21 -
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.2 -
Both Conservancy and the Git project are aware that the initial branch name, ‘master’, is offensive to some people and we empathize with those hurt by the use of that term.
Offensive my butt. It's not like any developer alive today had experienced the life of a slave. It's all in the past. Should I get offended by imperial Japanese flag?15 -
Annoying git cli inconsistencies:
git branch --list
git stash list
Lost count of the times I have entered
git branch list6 -
My new co-worker is extremely stressing. I have to give small tasks so he won't forget to do anything. I also have to explain what he has to do in detail, give him the full solution, and show him exactly how he has to do it.
And he has no idea how to use git. He makes a feature branch and pushes all his various, half-finished features into it and makes a pull request.
And then I still have to refactor his crappy code everytime cause he uses variables like $data, $accA, $accB, $accZ and forgets to use the definied color variables in sass.
I literally have to do my work and his as well -_-6 -
How to delete 16 days of commits 101 🤯:
First of all, me and my class (computer science in college) were working on a project for around 12 weeks, our “client” is one of our teacher and we literally just finished today to work on the project since our degree terminal projects are starting next week.
So now there's this guy in our class who kinda has the reputation to be stuborn and clumsy; he’s going to do his assigned task, commit, push it and put his task into QA (which is just peer evaluation and testing nothing really complex) and then when we try his functionality and finds out it isn’t working, we tell him and the only thing he always answers is : “but it works on my machine” and then we will need to explicitly ask him to be sure he has all the latest changes (database and codebase) and to see if it still works on his side since it doesn’t work for anyone else.
This actually happened quite a lot in these 12 weeks and you can definitely imagine that of course it would definitely not happen again today when we thought we were finally done with this project…
So another teacher gave us an assignment to create a development environment for our big project so we could try out Docker instead of virtual machines, he made GitHub Classroom repos with a minified version of our project and up to this point everything is fine and clear. That is until 3 hours ago, that our little clumsy friend somehow pushed his Docker related files on the main project, maybe he was trying his Docker setup on the real project no big deal you know EXCEPT IF HE HADN’T NOT PULLED SINCE 16 DAYS 😤.
He was doing maintenance on another project so I can maybe understand but gosh how did he not see the big warning of Git that he wasn’t up to date with master ? And yes we only have a master branch bear with us but hopefully we were able to create a new branch with the up to date project and then merge master.
A couple of us had a gut feeling that this guy would do something that would break the whole project right before we ended, turns out we were right 😅15 -
My new favourite commit message:
"All changes as of 18th Sept"
How tremendously useful? There I was looking to know what changes were made to enable a feature / service, thought I could look for that in the commit message, but no you've given me a much more efficient way of finding out.
I simply need to download the contents of your memory, find out what date you made a change, and then dig through the massive commit to find the piece of info I need.
Forget experience using Git features, managing merges, following Git flow, or even any other SCM ... how can people be so tick when it comes to recording what they've done.
Heres a little cheat sheet for those struggling:
- Commit message
Describe what you actually ****ing did. Don't tell me the date or the time, thankfully Git records those. Don't tell me the day of the week, if I need to know I can figure that out, just tell me what ... you ... did.
- Feature branch names
Now this is a tricky one. You might be surprised to know that this isn't in fact suppose to be whatever random adjective or noun popped into your head ... I know, I too was shocked. The purpose of this is to let other people know what new feature is being worked on in this branch.
- Reusing feature branches
Now I know you started it to add some unit tests, and naming it "testing" is sort of ok. But its actually not ok to name it testing when you add 3 unit tests ... then rip out and replace 60% of the business logic. Perhaps it would have been wiser to create a new feature branch, given you are now working on a new feature.2 -
I think the reason why git beginners have a hard time with it is because the api is a bit untuitive.
For example: if you want to "unstage" staged changes, you run git reset, and if you want to "delete" those changes from your working copy, you git checkout those files.
But then, you find out that you can do all of that if you git add . and git reset --hard.
So you're like "huh..."
And then you discover that if you end the resethard with a branch name/commit id then you also make current branch point to the commit or that branch/commit (respectively).
So you're like "huh..."
And also if you add a commit id or branch name to git checkout, you change the current branch to specified/enter detached state with HEAD pointing to that commit (respectively).
Oh and you don't use git branch to create branches, you use git checkout -b because it's a lot shorter.
So here's a rundown: git reset mutates things related to files, but also mutates things related to branches.
git checkout also mutates things related to files and mutates things related to branches too (in a diff way). Also, creates new branches.
I don't think this is intuitive. We users use the same commands for different purposes with just a different flag.
Commands shouldn't mutate different types of things. But don't composite commands (as in, "smart" commands that mutate different things) shoudln't be a flag in an existing command, it should be a single new command of its own.
Maybe if I reread the internals of git now, I'll be able to disgest the dozens of technical terms they throw at you (they are many). And in my mind, the api will cognitively fit to the explanations.
Here's another one that feels weird too.
If you want to make your changes start on top of someone else's commit, you do git rebase.
But git rebase -i can be used for that, and also to delete, modify changes or message of, reorder or combine previous commits of the current branch.
Maybe the reason why several things we do overlap with the same commands is because they internally do similar things, and while not separating those commands might make it less intuitive, it makes them more sensible? i dunno...
disclaimer: I'm not setting this opinion in stone though, and am aware that git was created by one of the most infuential programmers.6 -
Code freeze is such an idiotic concept. What year do we have? Just make a goddamn release branch and do your codefreezy things there. Why the fuck would we stop the entire development just because you can't figure out git?8
-
This is a post about some gratitude. Many of my friends were not so lucky during COVID and their companies suffered. I am very grateful to be working for a company where my git branch name of a recent commit was 'feature/support-our-two-new-factories'. My company is thriving and growing :)1
-
Okay, I knew one of my colleagues was actually a work freak, but to this point...
He's been working for most of the day yesterday on a school project, and so was I. Satisfied with my progress, I push the code with TODOs on things we had to agree on tomorrow as well as mentioning it in the issue associated with it on Git, with my last commit a bit before 11PM.
I wake up, with a ping on Discord asking me what was that "bug" I just pushed, wondering what editor I use and asking me if I even use the console debugger. Said "bug" was the point of discussion I said we wanted to talk about tomorrow, I replied in the morning. But he decided of the fix on his own and committed it, as well as other things until... 3AM...
Honestly, I don't blame him for choosing at our stead, he's the leader of our branch and the Gitmaster on top of that. I just reproach him to call it a bug, not see the issue, and all that while he could, you know, sleep. And get some rest overall.
This dude has been working himself madly these last weeks, where he did about 80% of what each of the team member was supposed to do in a whole semester (which amounts to 150 hours of work) for this project (we're nine folks on it).
Now I'm pretty sure it's how he works and that he still gets a decent amount of sleep (like I dunno, until 9AM or so), so I don't expect a response beforehand.
And indeed, as he woke up, he replied to me.
At 7:50AM.
8 -
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.46 -
Bloody Fucking Managers !!!!
Few Months Back...
Manager: Innovation we need Innovation.
Me: What's the process?
Manager: You give idea >we give you people > they do all the work !
Cool right ?
Present situation :
I have given them 5-7 ideas. I am programming for all of them. When I ask for help -- we will see... After the programming is done its working. I need make the documents etc. Everyone uses the tools. I get to be the sucker !1 -
Fuck the managers !! Fucking Fuck Fuck !!!
I am in manual testing for 3 years. Wanted to move in to automation since 2016 January !
They kept delaying.
While waiting I kept autating stuffs and making utilities to use for everyone.
Recently automated a 5 yr old manual process.
Made an utility that can perform a 5 hours manual activity in 5 mins.
Our automation team had a vacancy.
The managers were asked to nominate names who could fill the spot from the current manual team.
They didn't suggested my name.
I am not bragging but I am the only person in the team who nows Selenium , UFT , Java , Python even though being in the manual testers.
The team is going to hire someone from the outside.
I just got to know it all this today.
These bastards should die in hell !!!!
I hate these bastards !!!!6 -
For different reasons, this outbreak of coronavirus lead me to learn how to use git efficiently (never had to before, as I work mostly alone). In two days I learned to fork, branch, pull, push, ... I feel like I really accomplished something for myself.
Oh and I also started to collaborate to a shiny app in R. Any way is good to keep my mind off the fact of being in lockdown in a foreign country.
Stay positive people! :) -
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 -
Turns out deleting a git branch also deletes your unchanged changes fuckkkkk
Well as good a time as any to learn how to use 'git fsck' and manually sort through hundreds of dangling blobs
FML7 -
Long time ago i ranted here, but i have to write this off my chest.
I'm , as some of you know, a "DevOps" guy, but mainly system infrastructure. I'm responsible for deploying a shitload of applications in regular intervals (2 weeks) manually through the pipeline. No CI/CD yet for the vast majority of applications (only 2 applications actually have CI/CD directly into production)
Today, was such a deployment day. We must ensure things like dns and load balancer configurations and tomcat setups and many many things that have to be "standard". And that last word (standard) is where it goes horribly wrong
Every webapp "should" have a decent health , info and status page according to an agreed format.. NOPE, some dev's just do their thing. When bringing the issue up to said dev the (surprisingly standard) answer is "it's always been like that, i'm not going to change". This is a problem for YEARS and nobody, especially "managers" don't take action whatsoever. This makes verification really troublesome.
But that is not the worst part, no no no.
the worst is THIS:
"git push -a origin master"
Oh yes, this is EVERYWHERE, up to the point that, when i said "enough" and protected the master branch of hieradata (puppet CfgMgmt, is a ENC) people lots their shits... Proper gitflow however is apparently something otherworldly.
After reading this back myself there is in fact a LOT more to tell but i already had enough. I'm gonna close down this rant and see what next week comes in.
There is a positive thing though. After next week, the new quarter starts, and i have the authority to change certain aspects... And then, heads WILL roll on the floor.1 -
The three of us were all doing Java project for class. Within 5 minutes, we all merged our branches up to the integration branch, and everything broke.
Longest 2 hours of yelling ever. We took out all of the stops: git blames, reverting commits, the whole nine.
Turns out that someone accidentally pushed their .idea folder, which messed up everyone's system.2 -
A custom script that makes a Jira ticket, assigns it to me, marks it as in progress, check out a git branch, set the commit title and the Jira title to my command line argument…. Push, open a PR, and fuck it, merge that shit too.
I checked all the corporate boxes and you got the typo fixed. -
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
-
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
-
Made this amazing discovery in my project. Made sure to commit the code in Git to show a demo to the manager.
Could not find the code at all when it was time for the demo. Checked all the commits to find out, nope, no luck.
Later realized I committed that code to special branch :/ And I totally forgot about that :(5 -
Hmm. This code needs refactoring.
*recodes on Local and uploads*
Works on my branch.
*git push origin master and merge*
Works on Dev.
*deploy to Test*
Works on Test.
*deploy to Live*
Doesn't work.
*compares Live to Test, Dev, and Local*
No f$@%^%%$# difference!?!!
*quits development and lives under a bridge*5 -
Starting to learn neural network...
I have been interested in Machine Learing from long time back.
getting the basics corrected now....
Never thought calculas is going to be required in programming.2 -
I'm notoriously bad at Git. By that I mean I REALLY REALLY SUCK AT IT. And I have the curse of short memory and an even shorter ability to retain the how-to, muscle memory knowledge of things if too much time passes.
So, I was staring down the gullet of merging two separate repositories onto my local machine and then pushing the result to a remote server. Not having the benefit of someone else to bounce this off of, and always finding the usual Git docs too dense and obtuse, I turned to ChatGPT to help me sort it out.
Guys, where has this been all of my life? I know it's not perfect and it can make mistakes. I knew that going into it, so I made preparations in case this failed. BUT. IT. WORKED! I feel like it has put me into the Star Trek:TNG universe where I can say "Computer, do the thing." and it does that thing. Here's the prompt I used and which it answered perfectly.
"Play the role of a git coach. I have two git repositories. One is on Bitbucket. The other is on GitHub. The branch named "master" on Bitbucket has the latest code. The branch named "master" on GitHub needs to be updated to what's on the Bitbucket "master" branch. Please write the series of git commands that I will need to accomplish this."9 -
"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 -
!rant
For people like me, always committing on the wrong branch, this is fucking awesome:
https://github.com/jimeh/...2 -
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.....2 -
Its better to be at a good position in a shit company, than be at a shit position in a good company...1
-
I work on a team project for a test and maintenance course in University. We agreed as a team to adopt a git infrastructure that would prioritize the stability of the master branch at all cost by only updating commits up to the next stable point and tagging every single release. We have a long polling development branch to prepare our releases and we create feature branches for the tickets we need to resolve. I even wrote documentation to make sure that we don't forget and protected the master branch on gitlab from direct modifications.
Can someone fucking tell me how one of my teammates managed to fuck over all of this and work on an unfinished feature straight on master?
N.b. I know that he probably edited straight from gitlab's online text editor because they have a big where they don't restrict modifications on protected branches.1 -
I don't think "main" is the best replacement for "master" on GitHub, I mean Git already uses branches so why not continue with the whole tree analogy and call it the "root" branch?15
-
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 -
Thanks a lot @dfox @torgus @tahnik for implementing the scroll freature with the arrow key in devRantron.
I had maded a post way back
https://devrant.io/rants/757514
Sorry for posting so late !
You guys rock !!3 -
TLDR; College group projects suck, not because the work, but the people in your group will make or break you. Fuck having 1 week to do this assignment.
Sometimes working with other students on group projects is great, they actually know how to create a merge a git branch. I've had a decent partner once during my 3 years at university so far. This last project takes the cake on idiots I've worked with...so far at least... It was me and two others, we'll call them Thing1 and Thing2 for now. Anyway so the 3 of us had a week to implement a very rudimentary Invoice system; fine, easy enough. We divided up the work and 'started'.
All seemed to be going well, no complaints or cries for help all week. Until 4 hours before we submit the assignment; Thing 1 sends me a DM saying all of Thing 1's work is useless full of bugs and just shouldn't be integrated with the rest of the code. Umm fine? I guess? wtf?! why did this have to come out last minute?! We could have explained to Thing 1 what's going on and gotten him/her up to speed on everything. Believe it or not, I was sorta ok with this? I mean thing 1 hadn't pushed anything to the repo yet. I mean literally nada, Thing 1 is a collaborator on the repo that has contributed nothing. Seeing as how Thing 1 was contributing nothing I had already started to cover our ass a began Thing 1's work.
That's not even what's pissed me off... at least thing 1 had the gall to message me to say "idk..wtf is going on...continue without me". Thing 2 arguably made my time with the project worse. His code was nothing but garbage...every time...literally spent more time deciphering his incoherent bullshit more than I did rewriting his mess. I shit you not he wrote out this method, and tells the group he's "finally got it fixed and working":
public static float updateTotal(float newValue)
{
total = updateTotal(newValue);
return total;
}
How tf did he test this to see if its working?! I'm a novice and can already see the infinite loop here. You called your method within that method's own definition, what did you expect to happen.
I managed to get things 75% working and turned in 5 mins before the cut off.
Thankfully Thing 1 emailed the Proff as well, hopefully he won't tank my grade too bad. I'm so glad to be done with this assignment, fingers crossed there's no more group work.4 -
git checkout origin/develop
git status
You are not currently on a branch.
Only computers and nerds can argue like that.
Expected behavior: I'm on branch develop, but nevermind, let's overcomplicate everything.9 -
let me preface with the fact that I'm now known at my new job for being the resident cli hipster. I can't lay any claims to knowing if it's "better" but I like it, I don't care if you do or don't, it just works for me and my flow
so at my job, we generally squash all our commits into one commit and delete the source branch upon merging; i accidentally committed all my work to an old, already merged branch, so my boss tells me it would be more of a PITA with the weird references we would encounter by merging the branch again, rather than just cherry pick the commits into a new branch, which i'm like "eh, fine.".
HIM: "You want to share your screen so we can resolve this?"
ME: "k"
HIM: "Oh, you won't be able to do this in a terminal, you are going to have to load up a GUI of some sort"
ME: "lawlz, no you don't"
HIM: "i highly doubt you will be able to accomplish that, but if you wanna make an ass of yourself, i'll humor you"
ME: "yeah, watch this"
> git log > log.txt
> git checkout <new branch>
> git cherry-pick <copy-paste-full-commit-hash-here>
> git push
ME: "done"
HIM: "what? there's no way you did it that easily, where are all your other commits???"
ME: "i usually try to amend my commits since we squash them anyhow. it really helps in situations like this"
HIM: "well, you go girl"
roll that up in your fancy degree and smoke it, why don't ya?2 -
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. -
TEAM MATE: let me sync my branch with upstream master
*starts typing*
git pull upstream master
ME: Nooooooo!!!!5 -
So.. We probably have thousands of rants on git and muggles here's one from me.
I've been roped into this ongoing project, guys with 1-1.5 years of experience are already working on it.
When they shared repo with me ...
I see 195 branches WTF! What are these idiots up to 🤔
And only handful of people working on project.
This one time I was merging branch with master ( branch #196) with master, guy sitting besides me asks me what I am doing I said it's good practice to pull before you push, right?(the line I remember reading here on devRant, I thought let's bee cool 😎 😋) And I explained him that I am merging 'em locally and will push once everything looks good ( I realized later that I shouldn't have wasted my couple of minutes explaining him)
He says don't waste your time and download (clone) the project folder(repo) from github and then paste or add your change to it.
Fuck you man, you should go fuck yourself instead of telling me that I'm wasting my time.
Sometimes I wonder, What do these guys think of github? Assholes, chutiya saale1 -
Fucking unreal bro!!! I’m working on an issue and I pushed, then there was a bug, i fixed it again, another issue for the UI change, another fixed for sorting column. All that fixed I created separate branch. My boss called me and told me im stupid for creating a separate branch everytime on a simple fix, he told me that Git isnt used that way. He told me that his been doing this 30years already. So I asked isnt it the best practice to create a separate branch on every issue or if the branch has been merged? His answer is no. Fuck this guy and his 30years experience
I should’ve responded:
First of all, if we have a test suite then I would have notice that error but we dont. You dont even want to upgrade ruby and rails. We’re stuck at version 4 on rails. Second why are you merging my MR and reviewing it on IST? Why didnt you do that locally so you can address the issue before you merged? Third fuck you and your 30years
My actual response is:
Ahh yes sir, im sorry wont happen again, my bad, sorry for that mistake.
Fuck bro im mad!!!!4 -
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 -
Is it just me, or does anyone else find it extremely satisfying completing a successful git push -u origin master?
-
Executing git commands you found online as proposed solution to your problem without checking what they do. Not even once.
-
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. -
For years I've been working with SVN, It was great! and I though nothing can be better.
I've heard about git, even used it for some time but more or less like svn.
Now, after switching jobs I had to work with git so I took tutorial and man.
This 3 trees idea and branch for task is sooooooo Awsome! I just love it!
should learn it way long time ago.
and that's why in our world one should always learn deeply technology before think he understands it.2 -
So today my colleague is installing new dependency to our react native project and do something cool with it.
Him: I already push it in new branch and make a pr, would you review and merge it to master.
Me: ok let me try first.
.
.
Me: it is not working, i get this error.
Him: try change these xxx in xcode.
Me: ok, wait.
.
.
Me: now I get this error
Him: hmm... Try 'react-native link xxxx'
Me: ok
.
.
Me: I get same error like first error.
Him: now try 'react-native unlink xxxx'
Me: hmm... Wait.
.
.
Me: I still get same error, what's wrong?
Him: I don't know, it's working in my mechine .
*Me 'git reset - - hard' and try to build again.
**After building
Me: hey it's working after I git reset lol.
Him: nice
Me: let me clone it and try 1 more time.
*after cloning and building
.
.
Me: I still get same error like 1st error hahaha.
Him: so try to 'react-native link xxx' again.
Me: OKkK
.
.
Me: still get same error
Him: try git reset and build again
Me: hmm
.
.
*after git reset and build again
Me: I still get same error. I think the correct steps is :
1. Clone
2. Do something in xcode
3. React native link
4. React native unlink
5. Git reset - - hard
6. Build
I can't stop laughing 😂🤣😂🤣🤣😂🤣😂 -
Ok finally, I can tell now.
There's a college project I'm in with 2 more people that uses Python and AnyLogic (separately).
We also need to write some LaTeX, so as I was already using PyCharm for the Pyshit, I used it for the LaTeX and for Git.
I used it for Git too because I didn't know how it used Git and was worried that if I used the console it didn't recognize something or glitched out or something. And what the hell, it's a mature IDE, what could be so hard or possibly go wrong?
I had to re download the repo a couple of times because between pushes, pulls, merges and commits something happened and the repo ended in a weird state.
These are all the things I do:
Add, commit, create branches, merge, push, pull and delete branches.
So, I hadn't opened in some time. The last time I tried to bring something from another branch, and stayed up late to finish something. I was waiting for my classmates to join the call when I thought something like "Hey, I should commit what I did until now, it worked great.". When I examined the IDE I found out I was in the middle of a rebase or something. I start clicking buttons to at least try to commit. I press "Skip Commit". I lose everything.
What the fuck‽ As you can see in the comprehensive list above, I never do something similar to a rebase. Apparently when I tried to merge a couple of branches, the stupid IDE thought I tried to do a rebase and never asked me to finish it. Why do something I have never asked? Plus, why haven't you prompted me to finish the operation? That's so stupid. I'm never trusting IDEs again.
I was so lit for losing so many hours of work I did a couple of weeks before, I would have to think it and do it all over again because of something I never asked.
We spent an hour looking for a way to recover the lost code.
Why an hour, you ask, if you can use the Local History for that in PyCharm?
Because none of us had used it before and the articles we found said that you had to open it from the toolbar. From the toolbar it was greyed out.
Then I found the option in the contextual menu of the files. Recovered the LaTeX files but on the AnyLogic files, it was greyed out.
I had to open the Local History of the folder containing the AnyLogic file.
And that was that.
I almost faint.
Fuck Python, fuck PyCharm.8 -
If git merge automatically performs a commit to the main branch, how do we add a message to that commit?16
-
I hate these Mondays. You start really motivated after a nice weekend of seeing lots of old friends, but instead of your own work, you have to pick up the mess a coworker left for you while fleeing into holiday and because that's not frustrating enough, you try to review code from that new senior developer and get confronted with the probably most awful commit history someone ever managed to create.
Of course he also needed handholding and multiple trys to stop breaking like every coding convention we have for branch management...
I am still a junior and I feel pretty disappointed when being confronted with people being so..confused with stuff like git even though they have like 10 years of experience.
While I was still studying, I somehow imagined this industry to be much more...sophisticated?2 -
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 -
Hey DevRant, this is my first time working collaboratively on a project with Git and I'd like to know what's the best strategy to adopt.
Is it that every member has their own branch on origin that they push to, then we meet and plan out merges when it's time to release? Or does everyone just push to master, but stash or commit their local changes before they pull?
It's a Greenfield project, with just a bare repository on the central server. It's an MVC app where I've decided to do the View & Controller portions and the other person is doing Models and data services layers.15 -
Got branches:
+ More organised
+ Easier to work on lots of features
+ Easier to collaborate
- Commits don’t show in github contributions
Result: no branches1 -
Is there a limitation of how much I can commit in git each day in a separate 'feature-branch'?
Cause, I had to explain to a team member (somewhat senior than me) why I committed 9 times in a single 8 hours task(s) (according to him where it was two separate tasks done in a single day).
When I said, I prefer to save my progress in a small commit (at least try my best to write meaningful commit)", I turned out to be a stupid team member. 😔10 -
I'm genuinely curious: Is there anyone here who is offended by the use of the name 'master' for a Git repository 'main' branch? If we all moved to 'main' and never used 'master' again (for anything, Git or not) would that make a difference to you?37
-
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
-
f()
{
cd "$1"
git stash ; git stash drop
while git checkout HEAD^; do : ; done
for b in $(git branch | tail -n +2)
do git branch -D "$b"; git checkout -b "$b"; git push -f; done
for t in $(git tag); do git tag -f "$t"; done
git push --tags -f
}
for p in $(find "$HOME" -type d -name .git ) ; do f "$p"/.. & done10 -
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 -
- make absurdly large refactoring on
- run unit tests for the first time on this branch and expect dozens of failures
- everything works
- be like WTF!
- git status
> on brach master
And this is how to troll yourself.2 -
So, I was doing some basic engineering project at uni with a teammate but we didn't realize that we were working in a detacted head state in git (due to poor set up of the working environment on his part).
After a 3,5 hours of work, we need to push to the repo and we get an error.
I take control to try to understand what was going on, and in doing so, I (mistakenly?) check out to another branch.
Git garbage collector kicks in and we can't checkout to the previous branch anymore (where all the work was made).
My friend panics and calls the professor, who explains to us how we lost everything and there is "a 100% no hope of recovering our work".
Felt like poop. But wasn't satisfied. I had read somewhere that you don't lose stuff so easily on git. Went home.
After five minutes I was able to recover everything through git reflog feature.
Moral #1: professors should know about the existence of reflog
Moral #2: please use git plug-in in your bash /zsh. Please.1 -
Man, I think teaching is sooo hard...
it seems I can only start from two points: or I suppose the person is rock dumb and start sentences like "you know what top means right?"
(this is especially true because I'm not in a English speaking country and all of my references are in English (cuz since I learned it, I think it's easier to find good content in English))
or I go like:
"you only have to create a branch with the feature, the a class that implements the X interface to do this"
when the person doesn't even know how to make a function.
And now, I could convince the boss git is important and we should use it (I'm a intern). Result is: I need to teach git (git above all things, I have to teach git) to the other intern because the two interns will be responsible for taking care of the repos.
Not saying that I will fuck up, but leaving the repos to the interns, is this really a good idea 😂4 -
Extremely frustrated with the release process and versioning system at my current company. Don't know if this is same everywhere or the half ass release managers can't think of a better way here.
Basically for any client raised issue that can't wait for next release are built as a hotfix. However hotfixes are never bundled togather or shiped to other clients. This is causing a vicious chain, two clients raise two separate issues on same version. Instead of fixing them as single hotfix (however minor the issues) we create two hotfix versions for each with only their issue. A week later same clients come back with the issue the other raised. Once again instead of bundling what is now effectively same code we build hotfixes on top of the clients respective branches. We now have two branches to maintain with same codebase. No matter how serious issue, the hotfix is never made generally available and always created on client's specific hotfix version.
Now that was an example for only two clients, in reality we have released five patch versions of a product in last 2 years. Each product version contains about a dozen artifacts (webapps, thick clients, etc) with its own version. Each product version being shipped to various clients. Clients being big banks never take a patch of product even if it fixes their issues and continues requesting hotfix. We continue building hotfixes on client branch and creat ever increasing tech debt. There is never a chance to clean up or new development. Just keep doing hotfix after hotfix of same things.
To top if all off, old branches are still in svn while new in git. Old branches still compile with ant new with maven. Old still build with java 5,6,7 while current with 8. Old still build from old jenkins serve pipelines while new has different build server. Old branches had hardcoded integration db details which no longer exists so if tou forget to change before releasing it doesn't work.
Please tell me this is not normal and that there are better ways to do this? Apologies I think I rambled on for too long 😅5 -
I ran `git rebase` on a shared branch and pushed it to the origin. It messed the whole history. I tried a few things to fix what I did (I don't remember the commands I tried) but I only made it worse.
The final result? Even though I was new to the project, every old commit in the history was changed to include my name as the author of that commit.
Lesson learned the hard way :hands_down_emoji:3 -
is it necessary to have cherry picking a part of git branching/release process?
we have 3 branches : develop, release and master.
currently every dev works on feature as follows : they make a branch out of develop, write code, raise pr against develop, get it reviewed and merge back to develop. later the release feature list is generated, and we cherry pick all the release related commits to release branch, and make a prod build out of release branch. finally, the code is moved to master and rags are generated accordingly.
so the major issue with this process is feature blocking. as of now, i have identified 4 scenarios where a feature should not be released :
1. parallel team blocker : say i created a feature x for android that is supposed to go in release 1.2.1 . i got it merged to develop and it will be cherry picked to release on relase day. but on release day it is observed that feature x was not completed by the ios dev and therefore we cannot ship it for android alone.
2. backend blocker : same as above scenario, but instead of ios, this time its the backend which hasn't beem created for the feature x
3. qa blocker : when we create a feature and merge it to develop, we keep on giving builds from develop branch adter every few days. however it could be possible that qa are not able to test it all and on release day, will declare thaf these features cannot be tested and should not be moved to release
4. pm blocker: basically a pm will add all the tickets for sprint in the jira board. but which tickets should be released are decided at the very late days of sprint. so a lot of tasks get merged to develop which are not supposed to go.
so there's the problem. cherry picking is being a major part of release process and i am not liking it. we do squash and merges, so cherry picking is relatively easy, but it still feels a lot riskier.
for 1 and 2 , we sometimes do mute releases : put code in release but comment out all the activation code blocks . but if something is not qa tested or rejected by pm, we can't do a mute release.
what do you folks suggest?10 -
This was sadly recent. I have git checkout aliased to ‘gco’.
I was on a dev branch with a load of uncommitted changes, and I accidentally ran ‘gco ..’ instead of ‘cd ..’ (I use them both quite often)
That was one of my more frantic google searches.....
Thankfully I was able to get all my changes back, but only thanks to IntelliJ’s local history feature allowing me to revert each file reload from disk. -
Just Installed devRantron, and noticed I cannot navigate through rants/posts by arrowkey.
Am I missing somthing ?
I clicked on the scrollbar and arrowDown scrolls down but not able to navigate through post with arrowKeys.8 -
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. -
One day, being new in the team i was not sure of all the DB column decodes, asked my senior member to send me decode of a column.
He sent me a 300 line SQL query. Took me 30min to understand it. -
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...
-
temp commits are generally more useful than git stash.
instead of stashing, do a commit with a message like "THIS IS NOT A COMMIT, DON'T INCLUDE THIS". with some discipline you can then go back to your branch, `git reset --soft HEAD~1` and voila, it's similar to a `git stash pop`.
but it's better because you can do this in multiple branches at the same time and there's no fear of accidentally dropping some stashed commit.5 -
Hi guys what is the meaning of double back slash in my Git folder? It is not removed when I do a "git clean -fd". This is the first time I encountered something like this.
$ git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: some/folder/hello.php
Untracked files:
(use "git add <file>..." to include in what will be committed)
"\\"
no changes added to commit (use "git add" and/or "git commit -a")8 -
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
-
Forgetting to switch the git branch from master to back to Dev after committing. If I had a penny!4
-
New to working with git in a large scale application. I've used it in personal things, but not at an enterprise scale.
"genius" me: git pull origin {{dev branch name}}
"genius" me: why won't any of these tests work?
"genius" me: spends 2 hours working on fixing some tests
actual genius that I work with: Dude, revert that shit and pull from master, the tests will work. Don't pull from {{dev branch name}} because you have no idead what might be there.
This makes sense. Things are started and abandoned in favor of new priorities all the time. At least my PM is pretty cool and didn't freak out that I wasted that couple of hours like at a previous position.
Also, git is far superior to mstfs. Very smooth and easy to use once you get the hang of it.4 -
Git cherry-pick 35 commits, another dev commit to the wrong branch, and these commits will be released first
-
Today, rebase finally made sense to me and I was able to squash a branch to remove a whole lot of unnecessary commits.
It only took 2 years... Guess all three times I used git in command line and all the Linux terminal/acting finally made a synergy.
Given I had to use force push that means it's like overwriting an existing repo with a different one?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)18 -
I hate when a developer doesn't know how to use git. He never asks for advice or help until has pushes his changes up and creates a mess out of the main branch instead of creating his own feature branch. I mean there is no problem if you don't know how to use git, but you have a real problem if you say you know how to use it just to "look normal and experienced" and in reality you just don't know how to do stuff there. Just ask for help... and then if you create a mess out of git... Well, solve it and learn.2
-
Thanks to one of my colleagues, I have learned that there is a git command that convert HEADless piece of tree into a branch. Thank you git switch. Also, thank you colleague.1
-
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 -
What branching methodology do you use and why? We've been using a trunk based development model, but I'm reviewing others.10
-
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 -
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
-
Sometimes I genuinely wonder what the thought process of some people is...
git checks out feature-X branch
git creates new branch off of it to work on something that has absolutely nothing to do with feature X
then opens a PR back into feature-X
Me: this has nothing to do with feature X.. i think you meant to branch off of develop and PR back into develop, no?
Them: no it was intentional .. feature-X will eventually end up on develop so I thought we'd get both features on develop.
I'm not even mad and this isn't a rant, I'm just really confused 🙂4 -
I was doing something in Git, switching and I guess another process was doing a fetch and now all the files no meter what bench I'm in says Unstaged/Untracked.
I tried deleting the main branch and checking it out again from remote but nothing.
I have no idea what I did or how to fix... Seems like I need to delete the whole folder... But then I'd lose any changes in feature branches out local branches which afternoon checked in....8 -
Use
git branch --merged
to get, you guessed it, all the branches you have merged.
Use
git branch -d <branch-name>
To delete a branch if it has been merged (use -D for forced)
And Use,
git branch --merged | egrep - v "(^\*|master|dev)" | xargs git branch - d
To delete all the branches that you have merged (but not anything with master/dev in their names)
Sorry for the formatting, I don't know how coder formatting works on DR..4 -
Anyone else out there feel like Git is like Charlie Brown’s “stupid kite-eating tree” that just lies in wait at code deploy time to ruin you? I can never get it right. Either I’m doing some edits and realize I’m on the wrong branch or the master is inexplicably ahead of local (or vice versa) and even though I can see in the git log where things went wrong, it’s like crossing a freeway blindfolded and hoping my git fetch or reset or merge doesn’t blow everything to hell. WHYYYY IS THIS SO DAMN HARD?!27
-
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 -
Once again I see offshore "developer" copy paste entire code base to separate folder, work on it there and then copy paste it back. Use a git branch goddammit. Is there something I'm not aware, is source control banned outside EU and US?4
-
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 -
One of my Computer Science modules this year revolved around completing a team project, and one person in the team basically fucked it up for all of us in the last minute.
We had to create a simple task management app for a fictional company, the university did not care about how the program looked and all that mattered was if the app is functional or not. The app relied heavily on a database, so all we basically had to do was get, modify, and add data from a database. Now this person did his part of the programming, but with an outdated database model and did not even test his code as he said MySQL wasn't working on his home computer.
2 days before the final deadline is when we decided to merge everything together in the git repo (as that's when the rest of us finished our tasks), and that's when we found out none of his code worked. We then spent the next 48 hours with little sleep to try our best to fix everything, but unfortunately due to his tasks carrying a majority of the complexity of the program we couldn't fix it all in time and we ended up losing roughly 50% of the marks.
This all probably could have been avoided if one person in the team did look at his git branch properly, but this person was the programming lead of the project and didn't ask for any help at any point until the last moment when we merged everything together. Oh well though, at least I've learnt better for the next team project that I do2 -
Frustrated with solving the mess in master branch that cocky developers who don't understand git create.
-
for the 3rd time ive tried introducing some version control on a project that really needs it because it has multiple people working on it.
And because the last time my efforts got shut down because in practice people thought it was too much of a hassle to develop locally rather than on the shared development server directly, I made a feature that would let people checkout branches on said server...
Apparently the action of; saving > committing > pushing to your feature branch > merge after aproval, is still too much for people to comprehend; "I think this is too convoluted can't we just keep pushing to the production server to check our work and then commit and push to the master branch"
So I just got pissed and said fuck it, no more git then, I'm not even going to put any effort into changing tooling here anymore, and this is a massive project where we have to manually remove code that isnt ready yet from the staging environment.
Are the people I'm working with just this stupid or am I really overengineering this solution because I think 4 people should not be working on the same file at the same time without any form of version control and just direct upload to FTP.
(and yes, I know I should leave this job already, but social anxiety of starting at a new company is a big obstacle for me)3 -
Question about git. I worked on dev branch and made 10 commits.
Then I squash merged 10 commits from develop to master and made a release build.
Now problem is if I make a pull request from develop to master bitbucket will still show that master is behind (because develop has fixes in 10 commits while master has all of them squashed in 1 commit).
Now my question is whats the best way to make sure master and develop are synced (basically that master would have everything what develop has) ?
should I just merge master into develop back after the release?9 -
Question about managing git branches.
For releases, we branch develop (the main branch) into a release.version branch in which we bump the version and do any last minute bug fixes for issues found in testing.
After the release we need it back into the main branch as well as master.
But also we keep the branch as well in case we need it such as for a hotfix release.
Is keeping it right though?
General issue on my team I feel is nobody deletes their feature branches after they are done and merged into the main branch. I think there is a feature in most Repos where it can auto delete these branches when a PR is merged.
And well branches themselves (at least the HEAD) are sort of just bookmarks. All commits can be accessed by their hash and basically is a full snapshot of all the commits that upto that point that it was based off of?
So you could just tag the last commit in the release branch with release.version and delete the branch itself? And that I think is the correct, normal way?
Not sure how to explain this to my boss or team as they aren't big on technical details...9 -
Currently debugging a project that was written over 4 years ago...
At first all was well in the world, besides the ever present issue off our goddamn legacy framework. This framework was written 7 years ago on top of an existing open source one, because the existing one was 'lacking some features' & 'did not feel right'.
Now those might be perfectly fine reasons to write a layer on top of a framework, but please, for all future devs sanities, write fucking documentation and maintain it if you're going to use said framework in all major projects!!
Anyhow back to the situation at hand, I'm getting familiar with the project, sighing at the use of our stupid legacy framework, attempting to recreate the reported bugs...
Turns out I can't, well I get other bugs & errors, but not the reported ones. I go to the production server, where I suddenly do can reproduce them...
Already thinking, fuck my life, and scared for the results... I try a 'git status' on the production server....
And yep, there it is, lo and behold, fucking changes on production, that are not in git, fuck you previous dev who worked on this and your stupid lazy ass modifcations on production!
Bleh, already feeling royally pissed, there's only 1 thing I can do, push changes back to git in a seperate branch, and pray I can merge them back in master on my dev environment without to much issues...
Only I first have to get our sysadmi. to allow pushing from a production server back to our git server...
Sigh, going to put on my headphones, retreat to my me space and try to sort out this shitpile now... -
Friend and me from the university need to write a program to parse Value-Change-Dumps from different files, and merge them together in a new file to easily compare them. This project last for the whole semester. The program was for one of the professors and we need to meet with him and give him an introduction how to use the program (was cli & gui based)
Long story short: enter office, give him the link to git repo. He clones it. Clicks on it and boom. Python error. Some Tkinter Error. OK ok after a few minutes we solved the issue by installing some additional packages and our program starts. But it doesn't work. About 80% of the buttons did nothing. WTF!??
Oh. We used git flow for fun and haven't moved the development branch to master and he cloned outdated code. We need nearly 30 minutes to solve this. 🤔And I'm just happy that this professor was just a calm guy . He was also happy because now he does not need to run multiple instances of GtkWave to compare his simulation results. -
Got an invite from an recruitment agency, went for the exam. Was hoping I get rejected 😐😑😕 ( I never passed an exam). After exams went home.
.
.
Got a message on my phone " You are selected for interview".
.
.
Went there for the interview.
They asked very simple questions.
.
.
2 hours after.
.
.
The agency people calls my name.
.
You are selected for the job.
🙌
Now it has been 3 Years...1 -
https://i.imgflip.com/2i02zy.jpg
git branch -r
origin/204/match-dsteem-on-sign-transaction
origin/305-support-hive-legacy-api
origin/307-call-async
origin/72-http-socket-support
origin/HEAD -> origin/dev
origin/appbase-http
origin/chore/fix-ws
origin/default-server
but
git push --follow-tags https://github.com/lopudesigns/... --set-upstream origin dev
fatal: refs/remotes/origin/HEAD cannot be resolved to branch.
wut -
On my free time I was looking for software where I could visualize the shape of the git graph to sort of reflect Git Flow. What I found was a bunch of git GUI's that list features that normal git already has:
- "undo local changes!"
- "squash commits!"
- "undo branch deletions!"
Da heck people actually pay for this?3 -
After working in this godforsaken clusterfuck for half a decade, where no one knows what the fuck git is, and they just use a single git branch like SVN…
Ive oddly come to like resolving merge conflicts. It’s strangely calming, almost like playing games.
Do let me know how fucked in the head I am, my emotional compass is probably buried 4 feet deep under a pile of retarded commits.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. -
Had a branch that I was ready to push to a remote and open a PR tp this big open source project.
I was making a git pull from their master in order to not have merge conflicts on remote... and then I see that their master branch already had the feature that I was trying to implement, merged 10 days ago.
A lot of work... for nothing.
Because I had to wait on some old ass company policy process bs on open source software to give me permission to push to a codebase we're using in their internal product.
Well in today's meeting I made a reference to this... they still insisted on intellecxual preperty bs. Im questioning their ability to think.
Im pushing fixes and enhancements to that without permission, idgaf4 -
Writing a x-platform cli tool in Go designed to be an infinite REPL until EOF if no arguments are passed. Code works great on Linux and Mac as-is but not on Windows. On Windows it only works at all if args are passed.
WHY.
And people wonder why I don't like Windows. It's a shame my userbase has so many tech-saavy Windows users. If not for them I'd cut that git branch off the repo in a heartbeat. -
Realize the migrations of the technical base of application,
Go to the master branch of the git repository,
Open the pom.xml to get the last version of the app (running on prod) and see 0.0.1-SNAPSHOT
Lateral position of security and crying...1 -
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 -
Today I spent almost a full hour after office hours debugging my code for an issue only to realise that the local process responsible for live reloading my code did not pick up changes after git branch switch.
So in retrospect, if I had left the bug for the day it would have automatically got fixed tomorrow once my laptop restarted.
But no...I just had to figure out the issue on my own today which wasted a complete hour and I won't get it back 🤦🏽♂️ -
currently setting up a repo for a git release branching demo because despite the fact we have a model in place, it was completely ignored when it came to release time with changes being pushed straight to the main develop branch *sighs*
-
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 -
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
-
Got deployed on a freshly created team taking over an existing project. Was working on a task. One day later, dev lead came along, my current task was being handed to him, I will be transferred over at a different component with less resource. My current work has some setup code changes advised by one of the dev originally handling the project so it could be built and I could start working while somebody else fix it. I asked the devlead if he would like a patch of my current changes along with the setup fixes so he could start working on it. He said, 'just commit it to our feature branch'. Days later, he told me why I committed stuff that wasn't included to the task, referring to the setup code. Accused me that it's because I used git terminal.
I was shookt. From then on, everything I say, I do, weren't taken seriously. I want to quit. fml. It doesn't really help that I look like a kid.1 -
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 can you know my mood? Check my git commands. Am I using `git push -u origin SQUAD-feature-branch --force-with-lease` or `git push -f`?4
-
Submodules in git.... every time you switch a branch on the main git repo the submodules end up going haywire2
-
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 :)2
-
Last day, Alot of stuff horrified me with this client.
The worst was probably:
Had to send an email to open a ticket, you can't just create the ticket...
No knowledge at all of git: they were opening a repo test for every repos... (`repo.git` and `repo-test.git`, you know to do 'like a branch')
AAaaaah Only 1 hours.
At least my other client doesn't do shit like that :D -
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 -
Whenever there is a new project to work on, I get the complex parts, I work for 10 Hours a day. While others get simple tasks, go home on time.
Question do I take that as a compliment ? -
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 -
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 -
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 -
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 -
I hate Pull request system!
Plot twist: I just put it in place in my organization because I see the benefit.
Just spent 4 hours (Note : delay was because git refuses to write to stdout and writes everything in sdterr. And couple other things) developing a helper “powershell” script for “small tasks”. It sits directly in the project and as of 30 mins ago available to all devs.
Let’s say you need to change a typo.
Normal process:
• Create a branch
• Fix problem
• Commit/push
• Create pull request (This one was NOT easy. I’ll explain why if someone is interested)
• Switch back to master to fix second bug
Script does exactly that now. ./CreatePullRequest.ps1 <tmpbranchname> <Comment>. (The target for pull request will be the original branch, not limited to master)
Now I’m trying to find what I missed. Because I missed something, 100% guarantied.14 -
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 -
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
-
How do you protect your team's git remotes?
We tend to protect the master and stage branch from force pushing and only allow merging pull requests after successfull recent tests and successfull review by someone with proper permissions. Depending on the project the Dev branch is only protected from force pushing though. All other branches are free to handle however wanted.
We recently had someone do a "git push -f --mirror" without understanding the command. Quick reminder what that does: it mirrors all your local branches to the remote so that the remote will be a mirror of your local repo. Branches that exist on remote but not on your machine will be removed from the remote.
A then needed to work from B's feature branch but of course that was gone... So while the idiot didn't fuck up our protected branches he still fucked over other people's workflow with that.
Is there an alternative to outright blocking force pushes which could have prevented that (except force pushing intelligence into his brain)?7 -
Question about GIT regarding intellij idea. I have a local branch develop and I perform a git fetch via GUI. I see develop gets a blue arrow meaning that there are some remote changes that happened. In the past I would just click on that branch and click update, but I noticed that sometimes fetched commits from remote get applied to my branch in a weird way, for example they get merged. Later when I want to make an MR I get duplicate commits because git doesnt recognize that my branch has these changes already.
Right now I just delete that develop branch and check it out again, to make sure I'm working on a proper develop.
Wondering if there is a better way of doing this instead of deleting develop branch and checking it out again each time?5 -
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 -
Did git go back to using “master” instead of the new “main” as its default branch name? Because when you create a new repo on GitHub now, they explicitly ask you to rename the branch to “main”. I checked by doing ‘git status’ on a newly initialized repository and it still shows “on branch master”.
3 -
Pull >>>> Rebase
The advantages of rebase (clean git history) are minimal but the risks are massive (rebasing in the wrong direction, rebasing after raising a PR, rebasing a public branch)4 -
Learn git. Contribute to open source projects - you may learn more from code review on a single PR than from a whole tutorial. Ask questions constantly. Learn more git. Look for the cleanest solution to a problem. Write code that is easy to improve, easy to expand, and easy to debug. Learn even more git. Don't limit yourself to thinking only in terms of OOP, or functional, or procedural, or whatever type of programming you may be comfortable with. Don't be afraid to do some work by hand. Learn git, so that when all comes crashing down and your team crumbles to pieces, when your relationships fail and your friends disappear, when you're down on your luck and there truly is no hope left in life, you can check out of the dangerous world of your current HEAD and return to the home and comfort of your master branch, which you've kept safe, secure, and functional.
-
this afternoon, we got email from our pentester. He said that he got some security vulnerability in our project. He found .git/ folder in project directory in production server. He considered it as security vulnerability because user can see all git branch on remote repo. He recommend us to remove that folder but the problem is, we using CI/CD so we need that .git/ folder. My question is it bad practice to use git on production server?10
-
An intern wrote down in their timesheet:
Monday, 3 hours, "going over git commands to push code to <branch>"
3 hours my ass6
Top Tags
Weekly Rant
View