networkx / nx-parallel

A networkx backend that uses joblib to run graph algorithms in parallel.
BSD 3-Clause "New" or "Revised" License
31 stars 21 forks source link

MAINT : style fix - 2 #40

Closed Schefflera-Arboricola closed 8 months ago

Schefflera-Arboricola commented 9 months ago

from https://github.com/networkx/nx-parallel/pull/27

dschult commented 8 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:

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. :)