Are there good techniques when manually merging code ?
-
Or just hope for the best or just re-write everything from scratch with the 2 versions on different screens for reference ? I added a new feature in my developement branch as part of some bigger changes (database) , I needed to backport it to main branch, and I improved it on the main branch. Now I have to merge it back to the development branch. lolz... :rolleyes: I just hope it compiles at this point and start fixing it !!
CI/CD = Continuous Impediment/Continuous Despair
The best technique I have found is what I do before I have to merge. I create my working branch from whatever “main” branch is “gold”. Every morning, I merge that main branch into my working branch to pick up any changes others pushed up. At worst, there is an occasional small manual merge affecting a line or two. Then, when I create my pull request to merge my working branch into that main branch, I don’t have merge conflicts. A little preventive medicine goes a long way.
-
charlieg wrote:
now, if they could lock down comparing Excel files, I would die and go to heaven.
Since Excel files are containers for multiple files, this would be like comparing two folders with added complications. In addition to there being multiple worksheets containing either grids or charts (and also charts on the grids), there's also highlighting, conditional rules, VBA macros, etc.. And that's before you consider how to actually display the difference between 2 versions of a worksheet, assuming they can be matched up when columns and rows may have been moved around, the worksheets have been renamed and moved into a different order... Checking if the value of one cell has changed or is now a formula or an inserted image is barely the beginning!