bip/bip
bip/bip
3
0
Fork 1
Code Issues Pull Requests 2 Releases Activity

Update copyright info #19

Open
Kyoshiro wants to merge 1 commits from Kyoshiro/bip:755_copyright into master
pull from: Kyoshiro/bip:755_copyright
merge into: bip:master
Conversation 7 Commits 1 Files Changed 2 +25 -4
Kyoshiro commented 2024-02-07 13:40:28 +01:00
Owner
Copy Link

Fixes https://projects.duckcorp.org/issues/800

Fixes https://projects.duckcorp.org/issues/800
Kyoshiro added 1 commit 2024-02-07 13:40:28 +01:00
Kyoshiro commented 2024-02-07 13:40:58 +01:00
Author
Owner
Copy Link

Asked more people on IRC if they want to appear in the contributors.

There are a few more on DuckCorp redmine too, I wonder if they would like to be included though.
Shall we contact them?

Asked more people on IRC if they want to appear in the contributors. There are a few more on DuckCorp redmine too, I wonder if they would like to be included though. Shall we contact them?
Kyoshiro force-pushed 755_copyright from e9a7648e46 to 83968a9adc 2024-02-08 14:59:57 +01:00 Compare
Kyoshiro commented 2024-02-08 15:02:06 +01:00
Author
Owner
Copy Link

Only 2 contributors from Redmine are not listed atm.
@pilou, we're also missing your email address, not sure which one you want to add :)
Feel free to add it, I've checked allow edits from maintainers.

Only 2 contributors from Redmine are not listed atm. @pilou, we're also missing your email address, not sure which one you want to add :) Feel free to add it, I've checked allow edits from maintainers.
Kyoshiro force-pushed 755_copyright from 83968a9adc to 1702c5a258 2024-02-08 15:36:15 +01:00 Compare
pilou force-pushed 755_copyright from 1702c5a258 to 2824b8da7e 2024-02-18 00:16:44 +01:00 Compare
pilou approved these changes 2024-02-18 00:18:50 +01:00
pilou left a comment
Owner
Copy Link

I added my email address and rebased on top of master.

I added my email address and rebased on top of master.
Kyoshiro changed title from WIP Update copyright info to Update copyright info 2024-02-18 02:26:49 +01:00
Kyoshiro commented 2024-02-18 02:26:59 +01:00
Author
Owner
Copy Link

Thanks!

Thanks!
Kyoshiro commented 2024-02-18 15:16:46 +01:00
Author
Owner
Copy Link

@pilou what's the best way forward for a merge?
Shall I merge into the master here, or is it auto-pulled from the master branch on duckcorp and needs a manual merge?

@pilou what's the best way forward for a merge? Shall I merge into the master here, or is it auto-pulled from the master branch on duckcorp and needs a manual merge?
pilou commented 2024-02-19 00:00:45 +01:00
Owner
Copy Link

@pilou what's the best way forward for a merge?
Shall I merge into the master here, or is it auto-pulled from the master branch on duckcorp and needs a manual merge?

There isn't any automatic synchronization.

What I did for the few previous merge requests:

  1. checkout locally kyoshiro/<branch>
  2. rebase the branch on top of duckcorp/master
  3. push the result to kyoshiro (this one is required in order to flag the merge-request as manually merge), chapril and duckcorp remotes

Does it seem right to you? I don't remember: are you allowed to push to the duckcorp remote (because either you should be able to push there, either the repositories should be auto-synchronized)?

I don't use the gitea merge/rebase/squash button because I want to sign the commits (at least a merge commit, previously I rebased the whole merge request).

I don't ask/require you to sign your commits :)

> @pilou what's the best way forward for a merge? > Shall I merge into the master here, or is it auto-pulled from the master branch on duckcorp and needs a manual merge? There isn't any automatic synchronization. What I did for the few previous merge requests: 1. checkout locally `kyoshiro/<branch>` 1. rebase the branch on top of `duckcorp/master` 1. push the result to `kyoshiro` (this one is required in order to flag the merge-request as manually merge), `chapril` and `duckcorp` remotes Does it seem right to you? I don't remember: are you allowed to push to the duckcorp remote (because either you should be able to push there, either the repositories should be auto-synchronized)? I don't use the gitea `merge/rebase/squash` button because I want to sign the commits (at least a merge commit, previously I rebased the whole merge request). I don't ask/require you to sign your commits :)
pilou approved these changes 2024-02-19 00:00:58 +01:00
Kyoshiro force-pushed 755_copyright from 2824b8da7e to d69feeef12 2024-02-19 06:08:23 +01:00 Compare
Kyoshiro commented 2024-02-19 06:25:26 +01:00
Author
Owner
Copy Link

@pilou what's the best way forward for a merge?
Shall I merge into the master here, or is it auto-pulled from the master branch on duckcorp and needs a manual merge?

There isn't any automatic synchronization.

What I did for the few previous merge requests:

  1. checkout locally kyoshiro/<branch>
  2. rebase the branch on top of duckcorp/master
  3. push the result to kyoshiro (this one is required in order to flag the merge-request as manually merge), chapril and duckcorp remotes

Does it seem right to you? I don't remember: are you allowed to push to the duckcorp remote (because either you should be able to push there, either the repositories should be auto-synchronized)?

I'm not sure I'm doing the right thing here, in this case, is it:

git checkout 755_copyright
git rebase duckcorp/master

This checks me into my local branch whose remote is kyoshiro, then rebase against the master at duckcorp

git push --force-with-lease kyoshiro

This will update the kyoshiro/755_copyright branch here on chapril.

git push chapril

This will push/create the 755_copyright branch on chapril/bip project (not my namespace). But then maybe here I need to do this instead? (which I just did)

git push chapril master

Please let me know if I did crap haha ^^'

git push duckcorp

This I can't do, but then I don't think I have an SSH key configured at Duckcorp!

I don't use the gitea merge/rebase/squash button because I want to sign the commits (at least a merge commit, previously I rebased the whole merge request).

I don't ask/require you to sign your commits :)

Ah yes, I was actully worried about that myself.
I'm all for signed commits indeed, I'll sign mine too, if I don't that's a mistake from my side ;)

Thanks!

> > @pilou what's the best way forward for a merge? > > Shall I merge into the master here, or is it auto-pulled from the master branch on duckcorp and needs a manual merge? > > There isn't any automatic synchronization. > > What I did for the few previous merge requests: > 1. checkout locally `kyoshiro/<branch>` > 1. rebase the branch on top of `duckcorp/master` > 1. push the result to `kyoshiro` (this one is required in order to flag the merge-request as manually merge), `chapril` and `duckcorp` remotes > > Does it seem right to you? I don't remember: are you allowed to push to the duckcorp remote (because either you should be able to push there, either the repositories should be auto-synchronized)? I'm not sure I'm doing the right thing here, in this case, is it: ``` git checkout 755_copyright git rebase duckcorp/master ``` This checks me into my local branch whose remote is `kyoshiro`, then rebase against the master at duckcorp ``` git push --force-with-lease kyoshiro ``` This will update the `kyoshiro/755_copyright` branch here on chapril. ``` git push chapril ``` This will push/create the `755_copyright` branch on chapril/bip project (not my namespace). But then maybe here I need to do this instead? (which I just did) ``` git push chapril master ``` Please let me know if I did crap haha ^^' ``` git push duckcorp ``` This I can't do, but then I don't think I have an SSH key configured at Duckcorp! > I don't use the gitea `merge/rebase/squash` button because I want to sign the commits (at least a merge commit, previously I rebased the whole merge request). > > I don't ask/require you to sign your commits :) Ah yes, I was actully worried about that myself. I'm all for signed commits indeed, I'll sign mine too, if I don't that's a mistake from my side ;) Thanks!
Kyoshiro commented 2024-03-20 14:43:16 +01:00
Author
Owner
Copy Link

Actually, nevermind my comment, this has not been merged properly yet.
I will amend and merge later.

Actually, nevermind my comment, this has not been merged properly yet. I will amend and merge later.
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u 755_copyright:Kyoshiro-755_copyright
git checkout Kyoshiro-755_copyright
Sign in to join this conversation.
Reviewers
No reviewers
pilou
Labels
Clear labels
No items
No Label
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: bip/bip#19
No description provided.
Delete Branch "Kyoshiro/bip:755_copyright"

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?