This message was deleted.
# how-do-is
Slackbot
08/01/2023, 9:00 PMThis message was deleted.
ā
1
j
Jacob Gold
08/01/2023, 9:16 PMdoes rerunning
gt stack submitg
Gustavo Nunes Goretkin
08/01/2023, 9:18 PMNope. It shows
Copy code
š„ Validating that this Graphite stack is ready to submit...
āļø Preparing to submit PRs for the following branches...
āø 08-01-Change_the_constant_to_20 (No-op)
āø 08-01-Change_the_word_to_addition (No-op)
š All PRs up to date.j
Jacob Gold
08/01/2023, 9:19 PMoh wait, those commits are no longer in the branch on github i think
Jacob Gold
08/01/2023, 9:20 PMthat "force push" timeline event is github's way of saying that you pushed a commit that no longer includes them
Jacob Gold
08/01/2023, 9:20 PMif you go to the commits tab, i imagine that those other two commits are not included
g
Gustavo Nunes Goretkin
08/01/2023, 9:21 PMThe three commits are there
j
Jacob Gold
08/01/2023, 9:22 PMright, those first two commits look like they are before your commit ā do they correspond to PRs that were already merged?
Jacob Gold
08/01/2023, 9:23 PMif so you'll just need to
gt repo sync --restackg
Gustavo Nunes Goretkin
08/01/2023, 9:23 PMNothing has been merged at this point
j
Jacob Gold
08/01/2023, 9:23 PMwhat does
gt log longg
Gustavo Nunes Goretkin
08/01/2023, 9:23 PMI am not really sure how they ended up on this PR. It was unintentional
Gustavo Nunes Goretkin
08/01/2023, 9:24 PM Copy code
$ gt log long
* 3b700a9 - (2 hours ago) Change the word to addition - Gustavo Goretkin (origin/08-01-Change_the_word_to_addition, 08-01-Change_the_word_to_addition)
* 9c1e77b - (2 hours ago) Change the constant to 20 - Gustavo Goretkin (HEAD -> 08-01-Change_the_constant_to_20, origin/08-01-Change_the_constant_to_20)
| * 764f7f2 - (26 hours ago) Change the constant - Gustavo Goretkin (origin/07-31-Change_the_constant, 07-31-Change_the_constant)
|/
| * 2b04859 - (12 hours ago) Change to `plus` - Gustavo Goretkin (origin/08-01-Change_to_plus_, 08-01-Change_to_plus_)
| * f083ed7 - (26 hours ago) Change the constant - Gustavo Goretkin
|/
* 0d058b9 - (74 minutes ago) Add some info, which should not cause any conflicts on restacking - Gustavo Goretkin (main)
* 861557c - (2 hours ago) Make a commit that should cause conflict when restacking in graphite - Gustavo Goretkin
* 7aaab94 - (2 hours ago) Add example using Graphite in README - Gustavo Goretkin (origin/main)j
Jacob Gold
08/01/2023, 9:25 PMit looks like you've committed to your main branch locally
g
Gustavo Nunes Goretkin
08/01/2023, 9:27 PMThat's right. and then I restacked. I did not realize my
origin/mainGustavo Nunes Goretkin
08/01/2023, 9:29 PMI just did a
gt repo sync --restackgt stack submitj
Jacob Gold
08/01/2023, 9:30 PMare you sure that the main branch on github is on the correct commit?
g
Gustavo Nunes Goretkin
08/01/2023, 9:32 PMYeah. Perhaps the Github interface is just slow...
Gustavo Nunes Goretkin
08/01/2023, 9:32 PMBecause these commits are already on main.
j
Jacob Gold
08/01/2023, 9:34 PMyeah that view should show you any commits on your branch which do not exist in main
Jacob Gold
08/01/2023, 9:34 PMit seems like the original issue was caused by somehow having committed directly to main though ā was that due to a graphite bug?
g
Gustavo Nunes Goretkin
08/01/2023, 9:34 PMThanks for helping me understand where those commits came from, by the way.
j
Jacob Gold
08/01/2023, 9:35 PMno problem!
g
Gustavo Nunes Goretkin
08/01/2023, 9:35 PMThat wasn't a graphite bug. That was me intentionally trying to trigger a conflict when restacking, e.g. by a colleague not using graphite.
Gustavo Nunes Goretkin
08/02/2023, 5:27 PM@Jacob Gold, btw, GitHub is still showing those commits in the PR that are already on
main2 Views