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

CIP-1694 | Update French version to Commit (89bb166) #549

Closed
wants to merge 12 commits into from
Closed

CIP-1694 | Update French version to Commit (89bb166) #549

wants to merge 12 commits into from

Conversation

Hornan7
Copy link
Contributor

@Hornan7 Hornan7 commented Jul 12, 2023

Hornan7 and others added 12 commits July 3, 2023 08:12
Each line has been meticulously translated into French and we are committed to keeping it up to date.
- Renamed with a new suffix on the file basename using ISO 639-1 language code.
- Replaced the preamble by the one suggested by @KtorZ
Co-authored-by: Matthias Benkort <[email protected]>
- Updated machine-readable keys back to its original language.
- Corrections of the bad syntax of machine-readable keys.
- Change old hydra ledger spec links to GitHub repo (#548) 
  (Commit baa4ad5) 
- Removed rationale TOC link "Treasury withdrawals vs Project
  Catalyst" (#547) (Commit 89bb166)
@rphair
Copy link
Collaborator

rphair commented Jul 12, 2023

@Hornan7 here we have a problem common with new GitHub users on the Developer Portal and CIP repos, which is seen when commits from your previous PR(s) also show up in a new PR (like above), which spoils the configuration management.

This is mainly because you have been working on the master branch of your own fork, instead of properly creating a new branch just for these changes, and also because you haven't synced your fork with the upstream cardano-foundation repository.

There is no way of fixing these problems through this PR, so it has to be closed. Please take these steps before opening a new PR with your changes:

  1. First sync your own GitHub fork with its upstream repository. Then your own fork will have the older commits above already merged into it, forming a new baseline upon which your newer changes will be made. See: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

  2. If you follow the instructions at this link completely, the master branch in the fork on your own computer will also have the latest upstream changes... e.g. the local file with English version will have these links updated and the obsolete link removed. Don't proceed until you verify this: get some general help on git and GitHub if not.

  3. Create a local branch where you can do your edits, since as you can see above it's impossible to continue working from master. Example branch name: cip-1694fr-fix-links. See: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches

  4. When you've committed your changes, submit your pull request from that branch.

Other GitHub help links in the sidebar will detail all the steps of this process if & when you get stuck. When you've done the process correctly, the PR that you submit will only have the new commits for the new changes you've made in your new branch. 🤓

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.

2 participants