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

Correct broken BCP47 link #453

Merged
merged 1 commit into from Dec 13, 2019
Merged

Correct broken BCP47 link #453

merged 1 commit into from Dec 13, 2019

Conversation

sesam
Copy link
Contributor

@sesam sesam commented Dec 13, 2019

No description provided.

@BenjaminVanRyseghem
Copy link
Owner

@BenjaminVanRyseghem BenjaminVanRyseghem commented Dec 13, 2019

Hi!

Thanks for the PR :)

Could you please add yourself to the AUTHORS file, as well as add a line in the CHANGELOG?

Thanks in advance,
Benjamin Van Ryseghem

@BenjaminVanRyseghem
Copy link
Owner

@BenjaminVanRyseghem BenjaminVanRyseghem commented Dec 13, 2019

It looks like your develop branch was not up to date 😄

Also, could you squash all your commits into a single one?

Thanks in advance 😄

@BenjaminVanRyseghem
Copy link
Owner

@BenjaminVanRyseghem BenjaminVanRyseghem commented Dec 13, 2019

Thanks a lot!!

@BenjaminVanRyseghem BenjaminVanRyseghem merged commit 4dfd0ad into BenjaminVanRyseghem:develop Dec 13, 2019
1 check passed
@sesam
Copy link
Contributor Author

@sesam sesam commented Dec 13, 2019

Sure, no worries.

Github for open source has some issues, but I probably should use the github command line tool or something, since git by itself doesn't seem to allow me to track one branch but push updates to another origin and another branch.

There likely is some good PR-tool layered on top of plumbing, just I don't know which. Gerrit and GitKraken didn't convince me. I like command line tools and rebase -i. Otherwise gitup is my current best bet for managing messy branch/merge issues and splitting + rearranging commits

@sesam sesam deleted the patch-1 branch Dec 13, 2019
@BenjaminVanRyseghem
Copy link
Owner

@BenjaminVanRyseghem BenjaminVanRyseghem commented Dec 13, 2019

since git by itself doesn't seem to allow me to track one branch but push updates to another origin and another branch.

I am not sure to understand 😄

@sesam
Copy link
Contributor Author

@sesam sesam commented Dec 13, 2019

Thanks, I'm just looking for new knowledge on using github effectively for open source.

But I made one more try, with a "hack" in my local .git/config file. Trying to hack command line git into allowing me to base (and have git pull --rebase) use upstream = the software maintainer's repository, but still have git push send commits to my own where I have write access.
This maybe works at least partially:
https://www.dropbox.com/s/kh2dvdsdugolm97/Screenshot%202019-12-13%2013.38.03.png?dl=0

But I expect this to break something somewhere. Will see when next change on develop is merged, if I learnt something new or just created more work for myself (and any readers).

Anyway, have a nice day!

@BenjaminVanRyseghem
Copy link
Owner

@BenjaminVanRyseghem BenjaminVanRyseghem commented Dec 13, 2019

git remote add pr git@github.com:BenjaminVanRyseghem/numbro.git
git fetch pr
git checkout develop
git rebase pr/develop
git push --force-with-lease origin/develop

something like that might do, or ?

@BenjaminVanRyseghem
Copy link
Owner

@BenjaminVanRyseghem BenjaminVanRyseghem commented Mar 18, 2020

in numbro 2.2.0

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.

None yet

2 participants