On 2017-01-27, at 12:57 AM, Philip Oakley <philipoak...@iee.org> wrote: > > It doesn't happen at my work, but one has to ask how / why have we dug the > hole so deep and wide that this gross merge conflict continues to repeat it > self as a regular corporate activity, and then how to get out of here/there > (and somehow hoping that Git is a silver bullet / holy grail to solve those > human falibilities).
When you need to fix a mess, how you got into the mess isn't important. When a fire is burning, you want to put the fire out. That's urgent. Once you no longer have urgent issues, you can then ask "How do we prevent this again?". That's important. Being able to tell "Urgent", "Important", and "Both urgent AND important" apart is critical. Being able to ignore "Urgent but unimportant" is the hard skill. === Solving a bad merge can be either important or not. If you want to take two different codebases, and combine them into one (say, combining a Windows and a Mac codebase), it can be very painful. How you got there can be as simple as "The people who did the Mac port didn't work with the windows people, and just took it apart and wrote a mac native front end without any consideration of windows". Trying to fix that is pointless -- what you do going forward will have nothing to do with what you did in the past. iMerge looks really nice. I'm going to play with that myself. But ... iMerge looks like it works best when you have the "commit often" behavior on all branches. But lots and lots of commits makes a messy merge history. So people do a squash commit. And as soon as you do a squash commit, the history that iMerge wants is lost. So ... Somehow, a tool that retains the unsquashed history for future iMerging seems like the best solution, but I don't know of any. Anyone know git inside and bottom-up want to scratch that? --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
