I tried the branch/merge features for the first time with a feature I’m working on, but the merge doesn’t seem to actually happen.
I’m merging my feature branch into master, it seems to go through without issue, but then I don’t see any changes on master. The only strange thing I noticed, was that the first time I merged, after it said the merge worked or whatever, the modal briefly showed “[Object object]” with an X icon before the modal went away. I tried the merge multiple times, it seems to be “successful” every time, but master looks the same.
I looked at the console logs and the network logs, both look nominal.
As with git, you can’t repeat a merge of the same checkpoints multiple times, it will just do nothing, once a common ancestor checkpoint was created by the first merge.
If you by mistake eg selected the versions from your master branch resolving conflicts during the first merge, you need to create 2 new branches from checkpoints before the bad merge, merge them and merge the result into master. Simply reverting won’t help in this case
Ah okay, I just realized I didn’t make a checkpoint of the feature branch (I left it untoggled). Is it alright if I merge master into feature without restoring the feature? Or is that a problem? So far, we’re looking good on space, but I appreciate it.
Looks to be working, thanks for the help! I followed those steps:
Merge master into feature.
Restore feature to checkpoint before previous merge.
Restore master to checkpoint before problematic merge earlier today.
Merge feature into master.
Success!
This time I saw all the changes that were made on the feature. When I merged earlier today, for some reason I only saw a single small change I didn’t even remember making on the feature branch. All looks good now.