Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT : style fix - 2 #40

Merged
merged 3 commits into from
Jan 31, 2024
Merged

Conversation

Schefflera-Arboricola
Copy link
Member

from #27

@Schefflera-Arboricola Schefflera-Arboricola changed the title style fix - 2 MAINT : style fix - 2 Jan 30, 2024
@dschult
Copy link
Member

dschult commented Jan 31, 2024

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:

  • get my local main branch up to date with upstream main
  • go to the branch for the PR I want to rebase
  • Follow the rebasing process:
git 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. :)

@dschult dschult merged commit 516501e into networkx:main Jan 31, 2024
8 of 12 checks passed
@jarrodmillman jarrodmillman added this to the 0.1 milestone Jan 31, 2024
@jarrodmillman jarrodmillman modified the milestones: 0.1, 0.2 May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants