FSFE
/
fsfe-website
29
30
Fork 85
Code Issues 62 Pull Requests 14 Wiki Activity

Updating sq translations of a couple of event related files with references to CoC #233

Closed
besnik wants to merge 12 commits from (deleted):sq-translation into master
pull from: (deleted):sq-translation
merge into: FSFE:master
Conversation 4 Commits 12 Files Changed 5 +81 -5
besnik commented 2018-04-04 16:10:52 +00:00
Contributor
Copy Link

Done.

Done.
max.mehl commented 2018-04-05 08:59:32 +00:00
Owner
Copy Link

Sorry, but this is again a very large pull request. Could you please open up a new branch for every new pull request? This makes things easier.

It's very hard for me to see which file has been changed in which of the 12 commits.

The process is described here: https://wiki.fsfe.org/TechDocs/Git/Workflow

If it is not possible for this time, please tell me which commit I shall take over :)

Sorry, but this is again a very large pull request. Could you please open up a new branch for every new pull request? This makes things easier. It's very hard for me to see which file has been changed in which of the 12 commits. The process is described here: https://wiki.fsfe.org/TechDocs/Git/Workflow If it is not possible for this time, please tell me which commit I shall take over :)
besnik commented 2018-04-05 09:19:30 +00:00
Author
Contributor
Copy Link

Hmm I've followed the instructions there and elsewhere, just the names of the repos are different. I probably should start over again to make things easier for everybody.

The files I wanted to be pulled are the following:

0657f64e0a

bbfbdad007

Thank you!

Hmm I've followed the instructions there and elsewhere, just the names of the repos are different. I probably should start over again to make things easier for everybody. The files I wanted to be pulled are the following: https://git.fsfe.org/besnik/fsfe-website/commit/0657f64e0a5e4d5fd0c402b8cdc362b744f66e51 https://git.fsfe.org/besnik/fsfe-website/commit/bbfbdad007d332dbe97779d8938966da15c626b8 Thank you!
max.mehl commented 2018-04-05 09:34:09 +00:00
Owner
Copy Link

You always seem to work on the branch sq-translation. This way, you always include older commit as well. The process for each new pull request is:

git checkout master       # Switch to the main branch.  This is a branch in your
                          # local repository.
git pull upstream master  # Pull the latest version of upstream into your local
                          # branch.
git checkout -b NAME-OF-FEATURE   # start new branch for translation
git push origin NAME-OF-FEATURE   # push changes as soon as you are done
You always seem to work on the branch `sq-translation`. This way, you always include older commit as well. The process for each new pull request is: ``` git checkout master # Switch to the main branch. This is a branch in your # local repository. git pull upstream master # Pull the latest version of upstream into your local # branch. git checkout -b NAME-OF-FEATURE # start new branch for translation git push origin NAME-OF-FEATURE # push changes as soon as you are done ```
max.mehl commented 2018-04-05 09:37:26 +00:00
Owner
Copy Link

I've merged the two commits, thank you!

I've merged the two commits, thank you!
max.mehl closed this pull request 2018-04-05 09:37:34 +00:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
build

   
cgi Scripting

   
design

   
disruptive

Requires careful coordination and documentation changes

  
documentation

   
duplicate

   
easy

   
feature-request

   
help wanted

   
javascript

   
priority/low

   
question

   
system-hackers

   
tagging

   
text

   
translations

   
wait/bugfix

   
wait/inprogress

   
wait/misc

   
wait/proofread

   
wontfix

   
xsl
No Label
bug
build
cgi Scripting
design
disruptive
documentation
duplicate
easy
feature-request
help wanted
javascript
priority/low
question
system-hackers
tagging
text
translations
wait/bugfix
wait/inprogress
wait/misc
wait/proofread
wontfix
xsl
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: FSFE/fsfe-website#233
No description provided.
Delete Branch "(deleted):sq-translation"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?