!wkyjxWeAOBpKMvHbno:matrix.org

Codeberg

164 Members
Giving free projects a free home. https://codeberg.org56 Servers

Load older messages


SenderMessageTime
28 Nov 2021
@avlap:matrix.orgavlapHi, I'm a volunteer at a project where we learn kids and teenagers coding with processing etc.10:27:19
@avlap:matrix.orgavlapAre these kids allowed to host their project files on codeberg?10:27:37
@avlap:matrix.orgavlapIn other words, is there a age limit?10:27:47
@avlap:matrix.orgavlaplocation The Netherlands EU10:39:05
@awesomesheep48:matrix.awesomesheep48.meAwesomeSheep48I don't see anything about age in any of the legal documents13:37:29
@otto_richter:matrix.tu-berlin.deOtto RichterThere is no age limit currently (but you might double-check if local law require a consent of the parents to register there to share some data?), andit'd be cool if the projects are properly licenced. Even if you might not see any value, it'd be nice to educate about Free Software early, and it's also a requirement for the terms of use (although educational purpose is also covered by the bylaws and might be eligible for an exception if really necessary)15:37:21
@lenny:flipdot.orgLenny.Redacted or Malformed Event18:21:04
@mizzunet:matrix.org@mizzunet:matrix.org left the room.19:55:14
29 Nov 2021
@gwenn:tchncs.degwenn joined the room.15:14:55
@gwenn:tchncs.degwennHi folks, i have some trouble while merging between branches. https://codeberg.org/lerntools/base/pulls/7716:07:45
@gwenn:tchncs.degwennAnybode an idea?16:07:57
@rwa:tchncs.derwaaccording to https://codeberg.org/lerntools/base/branches your branch dev is 56 commits behind...you should bring branch dev up to date with rebasing (or merging master into dev)16:16:26
@gwenn:tchncs.degwenn
In reply to @rwa:tchncs.de
according to https://codeberg.org/lerntools/base/branches your branch dev is 56 commits behind...you should bring branch dev up to date with rebasing (or merging master into dev)
Thanks, so it would be better to create a new branch main and merge dev into it, i guess.
16:33:14
@rwa:tchncs.derwadon't know if this would change anything...i think your branch dev is simply too old to be merged, you should update branch dev before16:34:19
@gwenn:tchncs.degwenn
In reply to @rwa:tchncs.de
don't know if this would change anything...i think your branch dev is simply too old to be merged, you should update branch dev before
You mean i will edit one file and push it to dev and afterwards i can merge the branches?
16:43:01
@rwa:tchncs.derwano16:43:30
@rwa:tchncs.derwayou want to push dev into master, master has 56 commits that dev does not have i assume the branch cannot be merged because there are conflicts between the commits made to dev and the commits made to master the usual workflow is to update "dev" to also contain the recent changes from master16:46:26
@rwa:tchncs.derwathis can be done be rebasing dev or merging master into dev16:46:53
@rwa:tchncs.derwaor simply throw dev away, create a new branch based on master and re-apply the required changes16:47:36
@rwa:tchncs.derwait seems like you branched dev some time ago, but all the changes were put into master16:49:03
@otto_richter:matrix.tu-berlin.deOtto Richter gwenn did you try to follow my advice here? It links to the relevant section in the docs that also explains how you can do this! https://mastodon.technology/@codeberg/107360920783781074 17:25:07
@gwenn:tchncs.degwenn
In reply to @otto_richter:matrix.tu-berlin.de
gwenn did you try to follow my advice here? It links to the relevant section in the docs that also explains how you can do this! https://mastodon.technology/@codeberg/107360920783781074
Sorry, i tried it didn't worked...
17:42:20
@otto_richter:matrix.tu-berlin.deOtto Richter In the dev branch, did you run git fetch upstream && git rebase upstream/master ? upstream is the name of your remote. When you did git pull accidentally without --rebase, maybe it already tried to merge? And yoou might need to update your local refs from this remote first? 17:43:45
@otto_richter:matrix.tu-berlin.deOtto RichterOr can you elaborate what didn't work?17:43:53
@otto_richter:matrix.tu-berlin.deOtto Richter
$ git clone https://codeberg.org/lerntools/base && cd base
$ git checkout dev
$ git rebase master
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
error: could not apply 2be599d... Updated
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2be599d... Updated
17:49:31
@otto_richter:matrix.tu-berlin.deOtto Richterif you run the commands after the $, you'll find yourself presented with a merge conflict. Git adds information in this file, you'll have to make sure the file is how you want it, then add it and run git rebase --continue as explained in the error message.17:50:19
@otto_richter:matrix.tu-berlin.deOtto RichterThis is what the conflict-resolving part is about, and that's what Gitea / Codeberg can't automagically do for you, because the software does not know which part of the file you want to keep.17:50:57
@otto_richter:matrix.tu-berlin.deOtto Richter If you are done with all the conflicts, you can either force-push dev (git push -f), create a new branch just for the PR etc ... making a PR from the resolved dev branch to master should work in the Web UI again. 17:52:03
@otto_richter:matrix.tu-berlin.deOtto Richter Alternatively, but that's a different method if you don't want to force-push and rewrite the history, you could git merge mater and solve the conflicts, than try to merge dev back into master. 17:52:47
@otto_richter:matrix.tu-berlin.deOtto RichterMerging master into dev, and dev into master seems to work without conflicts for me, but maybe I messed too much around (+ I have some specific Git settings for merges IIRC, maybe they differ from the defaults)17:55:20

There are no newer messages yet.


Back to Room List