I'm working on #17067 to fix a merge conflict. I have fixed a number of merge conflicts in the past with no issues, but every once in awhile I run into the issues I'm having with 17067. I figured it is time to figure out what I'm doing wrong here.
- I merge in the lastest beta to my ticket - use meld to resolve merge conflicts - commit the changes There is now still a merge conflict!! My local branch has the beta merged in and everything works great. However, somehow there are still conflicts if I try to merge in the exact same master branch again. Clearly I'm doing something wrong here. Here is what I do specifically. - git merge the beta into my ticket branch - run meld through git mergetool - grab everything appropriate form the left/right columns into the center to get what I'm supposed to have - if necessary, manually edit the center column to get the correct merge - save and exit I think the issue occurs when I can't quite use the automatically generated blocks and I have to manually edit the center column (this is what is happening with 17067). Is this wrong? If so, how am I supposed to deal with the cases where the auto-generated blocks aren't quite right? Or, is this a red herring and I'm doing something else weird? Thanks, Ben -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
