git-ps
git-ps copied to clipboard
uptech
verify that request review patch series, followed by GitHub squash & merge, & git ps pull works correctly
Hrmm so maybe when I did this github squash and merge + pull, it seems like the only conflicts it had was from a patch that I added to rename a variable which I reordered into the stack. I’ll have to keep my eye on this as it goes
But maybe the flow is:
git ps ls
1 Feature B
0 Feature A
git ps rr 0
git commit
git ps ls
2 Feature A
1 Feature B
0 Feature A
git ps rebase
git ps ls
2 Feature B
1 Feature A
0 Feature A
Github Squash & Merge
git ps pull
CONFLICT
These are all resolved by accepting the current changes it seems, you end up with no changes after accepting and continue with a git rebase --continue
