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

add Petershagen/Eggersdorf to community list #702

Merged
merged 1 commit into from
Jul 18, 2023

Conversation

ZuquetuPlexis
Copy link
Contributor

this time with sign-off.

@FFHener
Copy link

FFHener commented Jul 17, 2023

Please rebase your PR. The check is failing due to the first two commits not being signed off. As you're not going to need them anyway you can combine them into one commit using git rebase HEAD~3. After this you will need to use git push --force to push your new commit to your PR.

@ZuquetuPlexis
Copy link
Contributor Author

@andibraeu
Copy link
Member

Hi @ZuquetuPlexis, you just need to run both git commands @FFHener mentioned to fix that issue

@ZuquetuPlexis
Copy link
Contributor Author

I tried to rebase, but there are merge conflicts:
rebase_conflict

I tried to solve these conflics by accepting the new changes, but now my change is not listed in there.
It looked like this:
github_destop_rebase_conflict
I have NOT used git push --force because this seems too off for me.

The current git log looks like this:
git_log

At this point i'm not sure what to do. The first thing that comes to mind would be deleting the fork, re-forking this repo, adding and then commiting the change including the sign-off message.

Signed-off-by: Tom Jannek <tom.jannek@hacrafu.de>
@FFHener
Copy link

FFHener commented Jul 18, 2023

Looks good to me

@andibraeu andibraeu merged commit c478b88 into freifunk:master Jul 18, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants