Displaying 2 results from an estimated 2 matches for "pr42422".
2020 Aug 10
2
How to deal with multiple patches to the same file
...with 'origin/master'.
>
>Changes not staged for commit:
> (use "git add <file>..." to update what will be committed)
> (use "git restore <file>..." to discard changes in working directory)
> modified: llvm/test/Transforms/NewGVN/todo-pr42422-phi-of-ops.ll
>
>no changes added to commit (use "git add" and/or "git commit -a")
>
>D:\upstream\llvm-project>git diff
>diff --git a/llvm/test/Transforms/NewGVN/todo-pr42422-phi-of-ops.ll b/llvm/test/Transforms/NewGVN/todo-pr42422-phi-of-ops.ll
>index ffe5d...
2020 Aug 10
2
How to deal with multiple patches to the same file
I think I understand the concepts, but I sure would appreciate a specific example, and I appreciate the offer. To make your life harder, could you start with what I should do given that I have not created a branch for the first patch? I just have the six files staged.
I have GitHub Desktop installed, if that makes any of the steps easier.
Thanks again, and no rush!
At 8/10/2020 10:07 AM,