This can happen when you're merging forward a branch that has one class of change applied to it and the branch you're merging from has had a totally different category of change applied to it the intent of the change is meaningful, but the merge itself just sits beyond what the computer will do for you.
#SMARTGIT WINDOWS XP CODE#
Often then the merge tool can't do very much to help because you've had to switch from merging at the level of source code as text to merging at the level of source code as abstract concept graph (and yes, there are an arbitrary number of levels of those, one for each level you can think about a program on). The hardest merges that are still sort-of possible are those where the changes conflict in subtle ways, but where you can still apply the principle of the thing to the result. What I label “difficult” might be what you label “impossible”. something screwed up so badly that it just can't be reconciled) but no possible ones that are particularly hard to get right. There are easy ones, and the occasional impossible one (ie. IME with BeyondCompare, there are no "difficult" merges. Of course right now it's fucking broken unless you use a preview release not intended for production, so thanks for that said in When did Git become terrible? Let's track down the specific commit.:
TFS wasn't anything to write home about, either, but it's about 58 eons ahead of Git. The one built into Visual Studio has been least-bad in my experience, mostly because they twisted and crammed the Git awfulness into the confines of the older TFS UI. I'm just worried they're going to be disappointed by that too, since every git gui I've tried has been its own unique brand of awful.
I've never tried that, although they send me emails pretty frequently asking me said in When did Git become terrible? Let's track down the specific commit.: I hope they tarred and feathered whoever suggested SourceTree in the first place, said in When did Git become terrible? Let's track down the specific commit.:Īnd demanded my boss buy licenses for Git Kraken instead. Said in When did Git become terrible? Let's track down the specific commit.:
0 kommentar(er)
