Topic: Move Widelands to GitHub

Sorry I tried to setup an environment with git and tortoise git gui. But I don't understand how to setup branches, how to check them out, or download them. I think git is much more complicated then bazaar. So if I can't find out I need to stay down from contributing.

Top

Quote

Have you followed the instructions in Gitprimer? At which point did you stop understanding them?

Git has a masive amount of features, but you will only need a few of them to get started.

And definitely get a GUI client. For Windows, I have some experience with TortoiseGit and can help you with instructions there.

I see that you have already creted a fork, so I recommend that you do your work there first until you become familiar with the process. Maybe also start with a smaller project - I have just pushed an incomplete brlancing branch that you could continue working on https://github.com/widelands/widelands/tree/balancing-201908 for changes proposed in https://www.widelands.org/forum/topic/4589/

ETA: I am tracking the migrated branches in the first post of this thread.

On the command line, you would:

git checkout upstream balancing-201908

Do your changes, then

git add <changed files>
git commit -m "Commit message"
git push origin balancing-201908

I always find the git add step quite time-consuming on the command line. If you use TortoiseGit, you can right-click on the widelands folder to get a context menu and you'll only need to "Add" any files that you have added, just like with Bazaar. When you commit with TortoiseGit, it will add the file changes and deletions for you.

Busy indexing nil values

Top

Quote

By the way, if you didn´t add new files and want to commit all changes, it´s a bit faster to skip git add and use git commit -am "message" instead.

Top

Quote

Since we don't have an established work flow yet anyway, I will not be strict about where you put your branch. I still recommend using a fork though if you're new to git.

If you want to move an existing branch to your own repo, I think it's best if we delete it from the official repo so that we'll know which one is the current branch.

Nordfriese wrote:

By the way, if you didn´t add new files and want to commit all changes, it´s a bit faster to skip git add and use git commit -am "message" instead.

Thanks, I have added that to the instructions.

Busy indexing nil values

Top

Quote

Is there a way to make downloading a specific branch a bit faster?

I'have cloned widelands master which lasts round about 25 Minutes (with a very fast internet connection). And now i wanted to test your branch at https://github.com/gunchleoc/widelands/tree/update-script and ran

git clone https://github.com/gunchleoc/widelands.git update_script

but it seems the download last also about 25 minutes...

Maybe i am doing something wrong?

Top

Quote