This PR fixes a mistake I made with the previous PRs. I mistakenly merged each branch with its immediate parent branch instead of merging them with base. Because I merged them in the order of creation, all changes only propagated by one branch. Therefore, lift-fully-present-constraint now contains all changes from refactor-graph-lifting and main contains all changes from add-empsn-code. So the only thing left to do is to merge lift-fully-present-constraint into main.
The mistake happened because I was expecting the head branch to be automatically deleted after each merge, which is apparently not a default setting. I suggest turning that on, what do you think @mauriciogtec ?
Edit: I went ahead and changed the setting for now; let me know if you disagree.
This PR fixes a mistake I made with the previous PRs. I mistakenly merged each branch with its immediate parent branch instead of merging them with base. Because I merged them in the order of creation, all changes only propagated by one branch. Therefore,
lift-fully-present-constraintnow contains all changes fromrefactor-graph-liftingandmaincontains all changes fromadd-empsn-code. So the only thing left to do is to mergelift-fully-present-constraintintomain.The mistake happened because I was expecting the head branch to be automatically deleted after each merge, which is apparently not a default setting. I suggest turning that on, what do you think @mauriciogtec ?
Edit: I went ahead and changed the setting for now; let me know if you disagree.