Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

Randomized Backstories

67 (25.9%)

Genetic Additions

98 (37.8%)

Mess Hall

50 (19.3%)

Revamped Area

44 (17%)

Total Members Voted: 257

[quinnr]

Git is fairly simple, install tortoise git, right click inside the folder, and select Git Clone.

That would be fine if tortoise git would install.

[Sukasa]

Try msysgit then, that's what I use and it's great.

[qwertyuiopas]

Alternatively, there is git gui. One menu option will download the changes, one menu option will then merge them in. Alternatively, use the menu option to open gitk, and then you can use a right-click option to instantly change to working from any point in it's entire history, or even commited future.

[nuker w]

FINALY, i got some alone time on comp. Due to life being a pain i am unable to play at all and am now back at boarding school, so yea. Will try to still be on fourms, but hardly as much. Should be able to play sometime next week though so im looking forward to that.

[quinnr]

Alternatively, there is git gui. One menu option will download the changes, one menu option will then merge them in. Alternatively, use the menu option to open gitk, and then you can use a right-click option to instantly change to working from any point in it's entire history, or even commited future.

When using GIT GUI, what do I put in the box when it asks me for a directory? I don't want something on my computer...

[head]

Server back up for real now.

[qwertyuiopas]

What box?

Well, when cloning a repository, you can give either a local or remote directory, so just put in the remote address.

After that is done, to check for changes, you can get everything new with remote(dropdown menu) ->fetch from ->origin.

Once you fetch changes, you use merge(dropdown menu) ->local merge to initiate the merge, causing it to try to apply all changes since your local copy's most recent related ancestor(basically, if you made changes, the last time that your code was the same as the uploaded code).

If it has issues where it can't automatically merge changes, it asks you what to do, by leaving them in the changed file list waiting for resolution, but you probably don't need that.

Repository(dropdown menu) ->visualize <something> will open gitk to view the history tree. Visualize master gives a visualization of only things related to your local copy, and the other one shows the entire fetched repository's worth of changes.

Right clicking on the text gives many options. "reset master branch to here" basically makes your local files exactly match the ones as they were at that time. I don't know if unmonitored files are affected.

[head]

Well i rolled back before my new merge due to massive errors.

[qwertyuiopas]

This morning, I forgot to push, and recently did, so if I accidentally caused a problem, then oops.

[Saint]

FINALY, i got some alone time on comp. Due to life being a pain i am unable to play at all and am now back at boarding school, so yea. Will try to still be on fourms, but hardly as much. Should be able to play sometime next week though so im looking forward to that.

That sucks man, Boarding schools blow. My cousin goes to one and he HATES it.

[woose1]

OOC: Rakonas: Damn sweden not being located in the middle of the atlantic ocean.
^^^
It's a bit laggy, even for me.

[zchris13]

FINALY, i got some alone time on comp. Due to life being a pain i am unable to play at all and am now back at boarding school, so yea. Will try to still be on fourms, but hardly as much. Should be able to play sometime next week though so im looking forward to that.

That sucks man, Boarding schools blow. My cousin goes to one and he HATES it.

On the other hand, I went to one, and it was awesome.

[Evilgrim]

Ermm..
Yeah..

I dislike not being noticed..

Ego problems.
So sue me..

OHEIDER.

[woose1]

I notice you. D:

[Mono124]

Ok... I have a questing here. When did B12 admins become assholes? "Not a democracy", "We aren't restarting because I said so", Multi traitor when nobody really wants it. Admins now hate Extended with a vengeance. I remember when B12 ALWAYS (90% of the time) played extended. Now? Not so much.