NorbertHartl wrote > https://github.com/magritte-metamodel/magritte
I'm trying to get my fork [1] back in sync with the upstream now that you've ported the code there. Conceptually, I'd like to replay the changes in my Magritte fork on top the last commit that is content-equivalent between the two. After some digging, this appears to be the upstream's commit `51f648b`, which is equivalent to the fork's `47df0a5` (both titled "[FIX]: Respect action shortcuts if specified. Otherwise, default to t…") This is the process I've followed so far. Feedback appreciated. 1. I created an "original_master" branch to preserve the fork's original history. Maybe this is not necessary long-term? 2. I created a "new_master" branch to merge both histories, based off upstream/master 3. I reverted that branch to the shared base commit, `51f648b` 4. I started a `cherry-pick 47df0a5..eedd386`. A few SO threads said this is the best way, but cautioned that the commits will have different SHA's i.e., A..D will become A'..D'. Maybe this is a good thing if we want to preserve the original history as well (although do we, see #1 above)? OTOH, issues that referenced commits will now point to old_master, and not master… On step #4, I've run into merge hell due to metadata. I guess I committed at that time with metadata and upstream is metadata-less. How do I dig myself out without manually approving each file for potentially hundreds of commits?! Thanks 1. https://github.com/seandenigris/Magritte3 ----- Cheers, Sean -- Sent from: http://forum.world.st/Pharo-Smalltalk-Users-f1310670.html
