[llvm-dev] I've intertwined two branches

Khem Raj via llvm-dev
Thu, 08 Apr 2021 19:32:05 -0000

On Thu, Apr 8, 2021 at 6:12 AM Paul C. Anagnostopoulos via llvm-dev
<llvm-dev at lists.llvm.org> wrote:
>
> Somehow I have managed to intertwine two branches in my local repository.
They are 'assert' and 'lists'. Here is what I see:
>
>   Switched to branch 'assert'
>   c:\llvm\llvm-project> git log2
>   14580ce2fdd1 (HEAD -> assert, origin/main, origin/HEAD, main, lists)
[TableGen] Make behavior of list slice suffix consistent across all values
>   3b9a15d910a8 [TableGen] Add support for the 'assert' statement in
multiclasses
>
>    Switched to branch 'lists'
>   c:\llvm\llvm-project> git log2
>   14580ce2fdd1 (HEAD -> lists, origin/main, origin/HEAD, main, assert)
[TableGen] Make behavior of list slice suffix consistent across all values
>   3b9a15d910a8 [TableGen] Add support for the 'assert' statement in
multiclasses
>

from commit SHA they look same branch to me. what cmds did you use to
switch from assert to lists branch ?  you can use git reflog to
inspect your tree and see where things changed

> I have no idea how I did this. Unfortunately, I ended up pushing both
revisions when I meant to push only the 'lists' branch. I could use some
help sorting out my local repository.
>
>
> _______________________________________________
> LLVM Developers mailing list
> llvm-dev at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev