Topic: Move Widelands to GitHub
niektory
Joined: 2019-06-03, 20:06
Posts: 206  Widelands-Forum-Junkie Location: Poland |
Posted at: 2019-09-17, 17:57
5 characters is a bit short for a hash. It won't be unique. 
Top
Quote
|
stonerl
Joined: 2018-07-30, 00:03
Posts: 327  Tribe Member |
Posted at: 2019-09-17, 18:08
That's just an abbreviated string from the original hash. Also 36^5 are roughly 60 million combinations. That should be plenty for us. Also if a string isn't unique anymore git automatically expands the string with an additional digit. Edited: 2019-09-17, 18:08
Top
Quote
|
|
stonerl
Joined: 2018-07-30, 00:03
Posts: 327 Tribe Member |
Posted at: 2019-09-17, 18:56
Just one more thing, regarding the workflow. Before merging a PR into master, either the person who submitted the PR or the one merging should squash the PR (can be done via the UI) to keep the history clean. Otherwise, we end up having all commits and messages in master, instead of one.
Top
Quote
|
GunChleoc
Topic Opener
Joined: 2013-10-07, 15:56
Posts: 3317  One Elder of Players Location: RenderedRect |
Posted at: 2019-09-18, 09:49
+1 to the squashing. When you make a PR, design the initial message so that it can be used as a commit message to make it easier for the reviewer. Busy indexing nil values
Top
Quote
|
|
GunChleoc
Topic Opener
Joined: 2013-10-07, 15:56
Posts: 3317 One Elder of Players Location: RenderedRect |
Posted at: 2019-09-18, 16:06
All branches have now been moved over. There's a list in the first post of this thread. Busy indexing nil values
Top
Quote
|
|
GunChleoc
Topic Opener
Joined: 2013-10-07, 15:56
Posts: 3317 One Elder of Players Location: RenderedRect |
Posted at: 2019-09-19, 14:09
I have updated https://www.widelands.org/wiki/TriagingBugs/ Ideas and feedback welcome Busy indexing nil values
Top
Quote
|
kaputtnik
Joined: 2013-02-18, 20:48
Posts: 2582 OS: Archlinux Version: current master One Elder of Players Location: Germany |
Posted at: 2019-09-20, 19:32
Can someone explain the sentence: "In principle, you can add as many forks as you want and call them anything you want. You can get a list by running git remote -v." I can't do more than one fork on GitHub (by clicking on 'Fork')... and how can i name a fork?
Top
Quote
|
|
GunChleoc
Topic Opener
Joined: 2013-10-07, 15:56
Posts: 3317 One Elder of Players Location: RenderedRect |
Posted at: 2019-09-20, 21:57
I mean on your machine. I have currently my own fork, the official one and fraang's fork accessible from my local repository. I have changed the explanation to:
Is that any clearer? Edited: 2019-09-20, 21:58
Busy indexing nil values
Top
Quote
|
|
stonerl
Joined: 2018-07-30, 00:03
Posts: 327 Tribe Member |
Posted at: 2019-09-21, 09:27
Just one note. GitHub allows creating Draft Pull Request. When creating an PR, just click on the arrow next to the Pull Request button and select Draft Pull Request. When opening a Draft PR, it can't be merged until the author gives it's okay. This avoids messages like "please do not merge"
Top
Quote
|
|
kaputtnik
Joined: 2013-02-18, 20:48
Posts: 2582 OS: Archlinux Version: current master One Elder of Players Location: Germany |
Posted at: 2019-09-21, 16:30
I guess you did that like you explained here: https://www.widelands.org/forum/post/29826/ ?
Sorry, not for me. But i can't really say what i do not understand because this sentence makes no sense at all to me, at least in the section Download the code, which handles downloading (cloning) the main repo. I think this sentence makes more sense in the section checking-out-a-branch-from-somebody-elses-fork?
Top
Quote
|
