Unexpected behavior of virtual branches that are re-applied after pushing

[wesharper]

I like to push things semi-regularly just to make sure I have a backup of my work and because I'm really going all-in on GitButler and I have definitely borked some stuff locally trying to do too much.

In the process of pushing, unapplying, re-applying, swapping, etc. I've encountered this issue a handful of times:

A bunch of commits exist locally AND on the remote branch. They are, for all intents and purposes, the exact same commits, but with separate timestamps. If I merge the upstream, I get a bunch of duplicate commits in the history. If I force push, it updates the timestamps for everything.

[Byron]

Thanks for reporting! I'd hope this will get fixed naturally as #3121 gets implemented.

[vorou]

hey, is there any workaround for this in the meantime? can I modify my flow somehow so that I don't end up in that state? I don't get why it happens only sometimes (but often)

[wesharper]

The new UI definitely makes things more clear. Although I haven't encountered this exact scenario with the new UI active. Will report back if I see improvements/issues.

[mtsgrd]

Feel free to re-open this issue if something comes up! Closing for now as it has been addressed in the recent commit list improvements. 🙏