<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<p><font face="Helvetica, Arial, sans-serif">And to some of us that
ain't quite the best, yet.<br>
</font></p>
<p><font face="Helvetica, Arial, sans-serif">Will it cause a problem
if I rename 'assert' to 'old-assert' and then create a new
'assert' branch? I shouldn't think so.</font></p>
<p><font face="Helvetica, Arial, sans-serif">The 'lists' branch
isn't needed anymore, so I can just delete it once I know the
build is okay.<br>
</font></p>
<p><font face="Helvetica, Arial, sans-serif">Thanks!<br>
</font></p>
<p><font face="Helvetica, Arial, sans-serif">~~ Paul</font></p>
<p><font face="Helvetica, Arial, sans-serif"><br>
</font></p>
<div class="moz-cite-prefix">On 4/8/2021 11:01 AM, Stella Laurenzo
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:CAEkedjhSemftsJu8c619Tf35TGbnwugidTgiRthMn3jjRrN5fg@mail.gmail.com">
<div dir="auto">Git happens to the best of us :)
<div dir="auto"><br>
</div>
<div dir="auto">Since you've already pushed, upstream should be
considered source of truth. If I were you, I would start a new
branch, pull fresh from upstream and then git cherrypick
commits you want to keep from your local branches into the new
branch. The git reflog is your friend on this, especially if
you start resetting, etc.</div>
<div dir="auto"><br>
</div>
<div dir="auto">Since I see you are on Windows, I recall some of
these things to be fairly easy with the Forks git gui.</div>
<div dir="auto"><br>
</div>
<div dir="auto">There are probably better ways to repair, but
for me, when I mess it all up, I find it easier to low tech
reconstruct what I want vs advanced solutions.</div>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Thu, Apr 8, 2021, 6:12 AM
Paul C. Anagnostopoulos via llvm-dev <<a
href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">
<div>
<p><font face="Helvetica, Arial, sans-serif">Somehow I have
managed to intertwine two branches in my local
repository. They are 'assert' and 'lists'. Here is what
I see:</font></p>
<p><font face="Helvetica, Arial, sans-serif"> <font
face="monospace">Switched to branch 'assert'<br>
c:\llvm\llvm-project> git log2<br>
14580ce2fdd1 (HEAD -> assert, origin/main,
origin/HEAD, main, lists) [TableGen] Make behavior of
list slice suffix consistent across all values<br>
3b9a15d910a8 [TableGen] Add support for the 'assert'
statement in multiclasses</font></font><font
face="monospace"><br>
</font></p>
<div><font face="monospace"> <font size="2">Switched to
branch 'lists'<br>
c:\llvm\llvm-project> git log2<br>
14580ce2fdd1 (HEAD -> lists, origin/main,
origin/HEAD, main, assert) [TableGen] Make behavior of
list slice suffix consistent across all values<br>
3b9a15d910a8 [TableGen] Add support for the 'assert'
statement in multiclasses</font></font></div>
<div><font size="2"><br>
</font></div>
<div>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.</div>
</div>
</blockquote>
</div>
</blockquote>
<br>
</body>
</html>