When did Git become terrible? Let's track down the specific commit...
-
@dcon said in When did Git become terrible? Let's track down the specific commit...:
plus the bug had to be approved.
I approve of this flaw in our product!
Do you mean working on the bug had to be approved?
-
@blakeyrat said in When did Git become terrible? Let's track down the specific commit...:
@dcon said in When did Git become terrible? Let's track down the specific commit...:
plus the bug had to be approved.
I approve of this flaw in our product!
Do you mean working on the bug had to be approved?
Yes. Once we froze for release, only those critical bugs that were approved were allowed into the release.
(tho I do like the first interpretation!)
-
@dcon said in When did Git become terrible? Let's track down the specific commit...:
only those critical bugs that were approved were allowed into the release.
This phrase doesn't make your point clearer...
Hey boss, I've a bug request here to crash the application if the user clicks OK.
Let me check the list of approved bugs... crash app on OK, you said? Yes, here... bug #1337, approved and scheduled for next release.
Ok, let me just dereference a null reference here and it's done.
-
@ixvedeusi said in When did Git become terrible? Let's track down the specific commit...:
This phrase doesn't make your point clearer...
s/bug/ticket/g
-
@dcon said in When did Git become terrible? Let's track down the specific commit...:
@ixvedeusi said in When did Git become terrible? Let's track down the specific commit...:
This phrase doesn't make your point clearer...
s/bug/ticket/g
I actually liked the original better, because it provides insight into how some companies actually do work.
If one defines a "bug" as a "defect in a work product" then there often are such items which do go through the "approval process".....Sad - but true.
-
@thecpuwizard I actually use 'bug' for both the problem in the code and the ticket to address that... So . (I briefly forgot where I was posting - so I deserved the above!)
-
@blakeyrat wants recommendations on git client software.
-
@shoulder-alien said in When did Git become terrible? Let's track down the specific commit...:
@blakeyrat wants recommendations on git client software.
Nobody ever know what Blakeyrat really wants!
-
@dcon said in When did Git become terrible? Let's track down the specific commit...:
I actually use 'bug' for both the problem in the code and the ticket to address that
Many do that. I find it to be problematic in many ways. I see it as..
- A Bug is a simple statement of an alleged deviation from ideal. If has a lifecycle (which can vary) from creation, through verification, and possibly to remediation.
- Work is required to address a bug. The (somewhat tool specific) Task item addresses this. Sometimes remediating a bug requires multiple tasks, other times multiple bugs are remediated by a single task.
- No work [Task] should be done without providing an increment of Value. Thus a PBI/Story represents the value delivery. This PBI may involve multiple tasks (not all of which are directly associated with Bugs!)
- A Test [TestCase] should be created which fails due to the bug, and passes once the bug is remediated. This is a defense against regression.
That the top 4, but should be a good start. The value received has been repeatedly demonstrated in multiple ways, with one of the most common being a much better understanding of "Technical Debt and the Related Interest".
What does this all have to do with the "...Git...terrible..." focus? Simple. Git is not designed for this level of tightly integrated information [aka a type of centralized information store].
-
@onyx said in When did Git become terrible? Let's track down the specific commit...:
KDiff3 sucks.
Oh my God are you right. For fuck's sake, who the fuck uses that?
You can right-click on the toolbar and get this:
If you uncheck the box, it makes the toolbar disappear. And no, there isn't a menu position to reenable the toolbar, you have to pixel hunt for the spot where the toolbar used to be and right-click hoping you get this:
and can switch the toolbar back on.
When you right-click on a line, you get this menu:
You'd think "Select Line(s) From X" would just be a command, but it's actually kind of a command, and kind of a switch.
If you change your mind and actually want A, you have to unselect C first, otherwise you end up with A-then-C. As far as I know there's no one-step way to switch from one to the other.
Also if you think you can just have kdiff3 skip from conflict to conflict and let you resolve it, sometimes you'll just end up with this:
What does it mean? Why did kdiff3 just give up here? Even in the auto-navigate mode it just skips it, it doesn't stop to let me select the resolution from C.
Also, you can't undo your resolutions, there's no Ctrl-Z at all, not even mentioning an undo stack. You have to hunt them down and unresolve them, and kdiff3 helps you with that... oh wait, no, when you resolve a conflict the only trace that's left in the result are the margin markings.
Oh, and they don't differentiate between conflicts and automerged sections either.
-
@maciejasjmj Yes, it sucks horribly. What is even more horrible is that I have not yet found a better one on Linux (not that I have searched a lot, but the few other that I've seen/tried are even worse...).
Is there a port of Tortoise to Linux?
-
@remi p4merge?
-
@remi The best diff/merge tool I've found is Diffuse, though for actual merging, I've actually come to enjoy xxdiff. It's ugly, but it's very clear on what it's doing, and it works.
-
@jazzyjosh said in When did Git become terrible? Let's track down the specific commit...:
@remi p4merge?
Is that on Linux though? I started using it, and aside from the near-lack of keyboard shortcuts it's quite nice.
I think BeyondCompare is still superior, but the trial expired and I'm too cheap to pay 60 bucks.
-
@maciejasjmj I still say Visual Studio is the Cadillac here, and it's available for free.
-
@blakeyrat said in When did Git become terrible? Let's track down the specific commit...:
@maciejasjmj I still say Visual Studio is the Cadillac here, and it's available for free.
Well, it's better than kdiff3 (damning with faint praise, and all that...).
Can you get VS to show you the base version alongside the versions you're merging? It's pretty much the one thing I'm missing from VS as a mergetool, it's really quite good otherwise.
-
@maciejasjmj I never use it that way honestly. I'm always just merging a branch into another branch.
-
@maciejasjmj said in When did Git become terrible? Let's track down the specific commit...:
I think BeyondCompare is still superior, but the trial expired and I'm too cheap to pay 60 bucks.
I finally just bought that.
-
@maciejasjmj Random googling says yes.
They do have an OSX version (though having to close the program when running
git mergetool
instead of just the window is annoying)