Closed Schefflera-Arboricola closed 9 months ago
I'm going to go ahead and merge this style fix even though there are tests failing on windows due to another issue. That way we can rebase or merge with main on the other failing PRs to get the style test passing.
I would suggest rebasing over merging for the other PRs if they don't overlap with this PRs changes much. My workflow for that is:
main
branch up to date with upstream maingit rebase -i main
If there are no conflicts your commits will just be added on top of main
and the branch is assigned to the last commit as before. If there are conflicts, use git status
to see what files have conflicts. Edit them looking for ====
or >>>>
in the files to see what the two different versions want to change it to wherever they conflict. Edit the file to be the way it should look after your commit. git add
that file. Use git rebase --continue
after all conflicts are handled.
Once the conflicts are resolved, push the revised branch up to github. A regular "push" won't work because the branch is now based on a different history (the new version of main
). So you have to "force push":
git push --force origin my_branch_name
If this gets messy, you can always do a git rebase --abort
and start over. And if you have many commits that repeatedly run into the same conflicts, you might prefer to use git merge
. :)
from https://github.com/networkx/nx-parallel/pull/27