[llvm-dev] I've intertwined two branches

Paul C. Anagnostopoulos via llvm-dev
Thu, 08 Apr 2021 13:12:04 -0000

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

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.


-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20210408/fc10c01c/attachment.html>