Re: Gitlab Migration

[theo]

August 29, 2021 10:33 AM, "Drew DeVault" <sir@cmpwn.com> wrote:

> 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.


I'll add it as a tangent here because others seemed to chime in. You have to 
see this from the point of view of someone not used to git at all.

Repo with double edits: 
https://git.sr.ht/~theo/rebase/log

Ok, so what happens?

1. Make some commits, push them
2. Rebase your stuff locally, get this warning after:
```
On branch master
Your branch and 'rebase/master' have diverged,
and have 1 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean
```
(A newcomer would read this as advice)
3. git pull
4. fix conflicts if there are any
5. git add . && git commit, then save the file with commit msg
6. git push


Then you end up with the state in that repo. Timestamps are all over the place 
and things get hilarious real quick.

I'd consider this a bug in git, though. That message is super confusing.

This can happen in all sorts of workflows. And the fix isn't "do it correctly", 
since it is so simple to get wrong. When other people add things to master 
branch while you work on your feature it gets even worse.

Hope this helps

--
Theo