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

Alignment with French version by yeKcim #62

Open
entorb opened this issue May 4, 2022 · 4 comments
Open

Alignment with French version by yeKcim #62

entorb opened this issue May 4, 2022 · 4 comments

Comments

@entorb
Copy link
Collaborator

entorb commented May 4, 2022

In https://github.com/yeKcim/hpmor the titlepage, fonts and probably quite some "under the hood" functions have been tuned. I suggest to adept these improvements.

I am currently considering implementing a German LaTeX version, hence it would be nice to have the "old" EN master and the "new and fancy" FR version aligned, so I won't need to cherry pick ;-)

@yeKcim: Could you please enable the GitHub issues feature in your Repo or provide another way of contacting you?

@entorb
Copy link
Collaborator Author

entorb commented May 4, 2022

I gave the "french" layout a try and like it very much, see EN PDF in FR layout here: https://github.com/entorb/hpmor-de/releases/download/en-test-fr-layout/hpmor.pdf

Code is in this branch: https://github.com/entorb/hpmor-de/tree/en-layout-from-fr

@yeKcim
Copy link

yeKcim commented May 4, 2022

I thought issues were open by default, it should be right now.
I REALLY REALLY want to push my modifications in EN repo (as @rjl20 can attest) but my git skills are limited and It is really difficult for me to propose clean patches.
I'm glad to read that my changes seem relevant and pleasant to you

@entorb
Copy link
Collaborator Author

entorb commented May 4, 2022

I just today figured out how to easily create PRs for the parent/forked EN repo

  1. In my DE repo, I used the "GitHub Desktop" tool to create a branch "hpmor-en" that is based on the last commit before I forked (and modified the repo). So that branch is an outdated but unmodified version of the parent
    image

  2. In GitHub Web I switch to that branch and "fetch upstream" to sync it with the EN parent
    image

  3. For each PR, I now plan to create a new feature branch, based on my (up to date) "hpmor-en" branch. For example "en-test-fr-layout"

  4. once this PR-branch is created, I can easily copy files or cherry pick commits from another branch.

  5. finally create a PR using the Web on my repo and my PR-branch

Hope that helps.

@entorb
Copy link
Collaborator Author

entorb commented May 8, 2022

addon: I just learned how to easily create branches and PRs for multible forked repos:

  • on github.com propose an edit for 1 file in the remote forked repo
  • this creates a branch in my repo based on that remote repo, called patch-1 or similar
  • rename the branch at github.com///branches/yours to keep it easier
  • not you can pull locally from your master to fetch the new fork-branch and locally add more modifications
  • I suggest keeping "unmodified" base-branches of other forks, so easily create new PRs and branches based on them

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

No branches or pull requests

2 participants