<div dir="ltr">Mark, I think you need to tell it exactly where to start for your rebase. Suppose you have 4 commits. You want something like<div><br></div><div> git rebase -i HEAD~4</div><div><br></div><div> Thanks,</div><div><br></div><div> Matt</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, Dec 6, 2020 at 5:19 PM Mark Adams <<a href="mailto:mfadams@lbl.gov">mfadams@lbl.gov</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">When I rebase over master I get conflicts in my files, alas.<div><br></div><div>I am thinking I should skip all the conflicts and then fix conflicts in the files that I touched and checkout any others from master ... Satish?<br><div><br></div><div>17:12 1 adams/landau-gpu-assembly *+|REBASE 29/58 ~/petsc$ git status<br># HEAD detached from 3659b78<br># You are currently rebasing branch 'adams/landau-gpu-assembly' on '3659b78'.<br># (fix conflicts and then run "git rebase --continue")<br># (use "git rebase --skip" to skip this patch)<br># (use "git rebase --abort" to check out the original branch)<br>#<br># Unmerged paths:<br># (use "git reset HEAD <file>..." to unstage)<br># (use "git add <file>..." to mark resolution)<br>#<br># both modified: include/petsclandau.h<br># both modified: src/ts/utils/dmplexlandau/cuda/<a href="http://landaucu.cu" target="_blank">landaucu.cu</a><br># both modified: src/ts/utils/dmplexlandau/kokkos/landau.kokkos.cxx<br># both modified: src/ts/utils/dmplexlandau/plexland.c<br># both modified: src/ts/utils/dmplexlandau/tutorials/output/ex1_0.out<br># both modified: src/ts/utils/dmplexlandau/tutorials/output/ex2_0.out<br></div></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, Dec 6, 2020 at 4:35 PM Jacob Faibussowitsch <<a href="mailto:jacob.fai@gmail.com" target="_blank">jacob.fai@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div>I would first rebase your branch over latest master and then perform your squash. Otherwise you will be squashing other commits which have become part of your branch history (perhaps via updating your branch by intermittently merging, not rebasing, master into it). It seems like that is what is happening right now, although maybe Satish will know better.<div><br><div>
<div dir="auto" style="color:rgb(0,0,0);letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;text-decoration:none"><div>Best regards,<br><br>Jacob Faibussowitsch<br>(Jacob Fai - booss - oh - vitch)<br>Cell: (312) 694-3391</div></div>
</div>
<div><br><blockquote type="cite"><div>On Dec 6, 2020, at 15:30, Mark Adams <<a href="mailto:mfadams@lbl.gov" target="_blank">mfadams@lbl.gov</a>> wrote:</div><br><div><div dir="ltr">This is the status after the first fail. I have nothing to do with these files. There are diffs, but I don't know anything about them.<div><br></div><div>Maybe I should skip failures (lot of them) and then checkout the conflicted files from master, then rebase over master?</div><div><br></div><div>Thanks,</div><div>Mark<br><div><br></div><div><br></div><div>6:24 1 adams/landau-gpu-assembly *+|REBASE-i 41/76 ~/petsc$ git status -uno<br># HEAD detached from 564e279<br># You are currently rebasing branch 'adams/landau-gpu-assembly' on '0c5056a'.<br># (fix conflicts and then run "git rebase --continue")<br># (use "git rebase --skip" to skip this patch)<br># (use "git rebase --abort" to check out the original branch)<br>#<br># Changes to be committed:<br># (use "git reset HEAD <file>..." to unstage)<br>#<br># new file: src/snes/tutorials/output/ex19_asm_matconvert.out<br>#<br># Unmerged paths:<br># (use "git reset HEAD <file>..." to unstage)<br># (use "git add <file>..." to mark resolution)<br>#<br># both modified: src/snes/tutorials/ex19.c<br>#<br># Untracked files not listed (use -u option to show untracked files)<br>16:25 adams/landau-gpu-assembly *+|REBASE-i 41/76 ~/petsc$<br></div></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, Dec 6, 2020 at 3:48 PM Jacob Faibussowitsch <<a href="mailto:jacob.fai@gmail.com" target="_blank">jacob.fai@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div>Mark,<div><br></div><div>What is the output of git status when it fails? Any files that are marked staged/uncommitted?</div><div><br></div><div>I’ve found that rebase will only work out of the box if your branch history is completely linear, i.e. no merge commits in between. If there are merge commits then git is not always able to resolve them. If this is the case then when the rebase fails at some commit some of the files will be staged with the changes from both commits that you must __manually__ reconcile.</div><div><br><div>
<div dir="auto" style="letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;text-decoration:none"><div>Best regards,<br><br>Jacob Faibussowitsch<br>(Jacob Fai - booss - oh - vitch)<br>Cell: (312) 694-3391</div></div>
</div>
<div><br><blockquote type="cite"><div>On Dec 6, 2020, at 14:22, Mark Adams <<a href="mailto:mfadams@lbl.gov" target="_blank">mfadams@lbl.gov</a>> wrote:</div><br><div><div dir="ltr">I am doing a rebase -i to squash commits and even if I do nothing git tris to apply about 7) commits, but starts to fail at #41 and if I try to --skip it it starts failing on every one. The error message is not very useful to me:<div><br></div><div>15:15 adams/landau-gpu-assembly> ~/petsc$ git rebase -i HEAD~5<br>error: could not apply a8e4255... Add test of PCASMSetSubMatType with nonlinear problem<br><br>When you have resolved this problem, run "git rebase --continue".<br>If you prefer to skip this patch, run "git rebase --skip" instead.<br>To check out the original branch and stop rebasing, run "git rebase --abort".<br>Could not apply a8e4255... Add test of PCASMSetSubMatType with nonlinear problem<br></div><div><br></div><div>Any ideas? Maybe rebase over master first?</div><div><br></div><div>Thanks,</div><div>Mark</div></div>
</div></blockquote></div><br></div></div></blockquote></div>
</div></blockquote></div><br></div></div></blockquote></div>
</blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div>What most experimenters take for granted before they begin their experiments is infinitely more interesting than any results to which their experiments lead.<br>-- Norbert Wiener</div><div><br></div><div><a href="http://www.cse.buffalo.edu/~knepley/" target="_blank">https://www.cse.buffalo.edu/~knepley/</a><br></div></div></div></div></div></div></div>