Re: Gitlab Migration

[Drew DeVault]

On Sun Aug 29, 2021 at 10:30 AM CEST, Theodor Thornhill wrote:
> I know one way to do this, after having to untangle a coworkers mess a
> couple of years ago:
>
> 1. Create your branch
> 2. Make some commits
> 3. Push them because work day over
> 4. Next day realize you should change something
> 5. Edit history
> 6. Get message from git that remote is diverged, pull to fix
> 7. Get a million conflicts with old commits
> 8. Resolve conflicts
> 9. Force push
> 10. Since this took all day leave work
> 11. Go back to 4
>
> You won't believe how crazy this case become. I've seen same commit at
> least 6 times in the same pr.

Are you sure you're rebasing in this scenario and not making merge
commits? If you can come up with a series of git commands which
reproduces this scenario, I would like to investigate further. Let's
follow up off-list.