Guide to git - Revision history

Itsmeowdev: Fix GitKraken grammar

2023-04-16T06:23:08Z

Fix GitKraken grammar

← Older revision		Revision as of 06:23, 16 April 2023
Line 186:		Line 186:

	Done! Now go to your fork on GitHub and refresh, you’ll see something like “changes have recently been pushed to branch my-pr-that-does-something” with a big “Open pull request” button. Press that and make sure it’s going to the main repository. You can also do this manually from the Pull Requests tab on your fork.		Done! Now go to your fork on GitHub and refresh, you’ll see something like “changes have recently been pushed to branch my-pr-that-does-something” with a big “Open pull request” button. Press that and make sure it’s going to the main repository. You can also do this manually from the Pull Requests tab on your fork.
	=~~I am using Gitkarken!~~=		=GitKraken=
	~~Skip things. I believe you know stuff well.~~
	==How to update your branch from master==		==How to update your branch from master==
	{\| class="wikitable"		{\| class="wikitable"
Line 196:		Line 195:
	\|[[File:Gitkrakenpage1.png\|frameless\|500x500px\|center]]		\|[[File:Gitkrakenpage1.png\|frameless\|500x500px\|center]]
	\|		\|
	* Go to your master (~~Git web page~~), and sync it to up-to-date		* Go to your master branch (on GitHub), and sync it to up-to-date
	\|-		\|-
	\|[[File:Gitkraken-updateyourmaster.png\|center\|frameless\|400x400px]]		\|[[File:Gitkraken-updateyourmaster.png\|center\|frameless\|400x400px]]
	\|		\|
	* ~~pull~~ your master(local) from your master(remote ~~github~~)		* Pull your master (local) from your master (remote GitHub)
	\|-		\|-
	\|[[File:Gitkraken-dragyourmaster.png\|center\|frameless\|400x400px]]		\|[[File:Gitkraken-dragyourmaster.png\|center\|frameless\|400x400px]]
Line 208:		Line 207:
	\|[[File:Gitkrakenmerge2.png\|center\|frameless\|444x444px]]		\|[[File:Gitkrakenmerge2.png\|center\|frameless\|444x444px]]
	\|		\|
	* if it’s not compatible, merge-conflict will ~~happen~~. Click the file in the issue. It’s not <code>"Mark resolved"</code>.		* if it’s not compatible, a merge-conflict will occur. Click the file in the issue. It’s not <code>"Mark resolved"</code>.
	\|-		\|-
	\|[[File:Gitkrakenconflictslist.png\|center\|frameless\|500x500px]]		\|[[File:Gitkrakenconflictslist.png\|center\|frameless\|500x500px]]
	\|		\|
	* (1): click these lines, then it will be the bottom window (2). clicking a line will transfer only one line. clicking a check-box will transfer the whole lines. (the example clicked different lines to let you recognise it’s possible to put different lines, but you won’t really do that in this way. There’s no reason to transfer lines like this)		* (1): click these lines, then it will be the bottom window (2). clicking a line will transfer only one line. clicking a check-box will transfer the whole lines. (the example clicked different lines to let you recognise it’s possible to put different lines, but you won’t really do that in this way. There’s no reason to transfer lines like this)

	<blockquote>NOTE:		<blockquote>NOTE:

	My suggestion for handling this is to transfer all lines from both of these, and compare how the new logic is different.		My suggestion for handling this is to transfer all lines from both of these, and compare how the new logic is different.

	in this image, the conflict is only 3 lines, so just transferring a single line would be enough, but when it’s massive, comparing all lines is important.</blockquote>		in this image, the conflict is only 3 lines, so just transferring a single line would be enough, but when it’s massive, comparing all lines is important.</blockquote>

	* (2): the result of your merge-confliction resolve.		* (2): the result of your merge-confliction resolve.
	* (3): The list of where merge-confliction occurs.		* (3): The list of where merge-confliction occurs.
	* (4): click this once it’s done		* (4): click this once it’s done

	click (4) once the merge resolve is done.		click (4) once the merge resolve is done.
	\|-		\|-
	\|[[File:Gitkrakenmerge.png\|center\|frameless\|429x429px]]		\|[[File:Gitkrakenmerge.png\|center\|frameless\|429x429px]]
	\|~~and do this~~.		\|Now commit your changes.
	\|}		\|}
	Q. How can I resolve the map ~~conflict~~?		Q. How can I resolve the map conflicts?

	~~A. Check this page: [[Map_Merger]]. I really haven’t had much cases to resolve map conflict, so I don’t know… I hope this can help.~~

			A. See [[Map Merger]]
	{{Contribution guides}}		{{Contribution guides}}

EvilDragon at 04:03, 16 April 2023

2023-04-16T04:03:14Z

← Older revision		Revision as of 04:03, 16 April 2023
Line 1:		Line 1:
	s
	= Git Command Line =		= Git Command Line =
	Many are drawn to GUI versions of Git, such as GitHub Desktop, GitKraken, and VSCode’s Git integration. However, I believe this is more of a hindrance than a help. If you’re just making mapping or sprite PRs, sure, maybe you can get along just fine with GitHub Desktop. However, these tools lack the expansive features of the command line and are harder to get help with. Command line is far more google-able if you have problems and I highly recommend it. Far more people will be able to assist you if you are using command line than an GUI tool.		Many are drawn to GUI versions of Git, such as GitHub Desktop, GitKraken, and VSCode’s Git integration. However, I believe this is more of a hindrance than a help. If you’re just making mapping or sprite PRs, sure, maybe you can get along just fine with GitHub Desktop. However, these tools lack the expansive features of the command line and are harder to get help with. Command line is far more google-able if you have problems and I highly recommend it. Far more people will be able to assist you if you are using command line than an GUI tool.
Line 186:		Line 186:

	Done! Now go to your fork on GitHub and refresh, you’ll see something like “changes have recently been pushed to branch my-pr-that-does-something” with a big “Open pull request” button. Press that and make sure it’s going to the main repository. You can also do this manually from the Pull Requests tab on your fork.		Done! Now go to your fork on GitHub and refresh, you’ll see something like “changes have recently been pushed to branch my-pr-that-does-something” with a big “Open pull request” button. Press that and make sure it’s going to the main repository. You can also do this manually from the Pull Requests tab on your fork.
	==I am using Gitkarken!==		=I am using Gitkarken!=
	Skip things. I believe you know stuff well.		Skip things. I believe you know stuff well.
	===How to update your branch from master===		==How to update your branch from master==
	{\| class="wikitable"		{\| class="wikitable"
	\|+		\|+

EvilDragon: /* I am using Gitkarken! */

2023-04-16T03:59:37Z

I am using Gitkarken!

← Older revision		Revision as of 03:59, 16 April 2023
Line 231:		Line 231:
	Q. How can I resolve the map conflict?		Q. How can I resolve the map conflict?

	A.		A. Check this page: [[Map_Merger]]. I really haven’t had much cases to resolve map conflict, so I don’t know… I hope this can help.
	[[Map_Merger]]
	I really haven’t had much cases to resolve map conflict, so I don’t know… I hope this can help.

	{{Contribution guides}}		{{Contribution guides}}

EvilDragon: /* How to update your branch from master */

2023-04-16T03:57:48Z

How to update your branch from master

← Older revision		Revision as of 03:57, 16 April 2023
Line 191:		Line 191:
	{\| class="wikitable"		{\| class="wikitable"
	\|+		\|+
	!~~image~~		!images
	!instruction		! width="400px" \| instruction
	\|-		\|-
	\|[[File:Gitkrakenpage1.png\|frameless\|500x500px\|center]]		\|[[File:Gitkrakenpage1.png\|frameless\|500x500px\|center]]
Line 228:		Line 228:
	\|[[File:Gitkrakenmerge.png\|center\|frameless\|429x429px]]		\|[[File:Gitkrakenmerge.png\|center\|frameless\|429x429px]]
	\|and do this.		\|and do this.
	\|-
	\|
	\|
	\|-
	\|
	\|
	\|}		\|}
			Q. How can I resolve the map conflict?

			A.
			[[Map_Merger]]
			I really haven’t had much cases to resolve map conflict, so I don’t know… I hope this can help.

	{{Contribution guides}}		{{Contribution guides}}

EvilDragon: gitkraken

2023-04-16T03:55:46Z

gitkraken

@@ Line 1: / Line 1: @@
-<span id="git-command-line"></span>
 = Git Command Line =
 Many are drawn to GUI versions of Git, such as GitHub Desktop, GitKraken, and VSCode’s Git integration. However, I believe this is more of a hindrance than a help. If you’re just making mapping or sprite PRs, sure, maybe you can get along just fine with GitHub Desktop. However, these tools lack the expansive features of the command line and are harder to get help with. Command line is far more google-able if you have problems and I highly recommend it. Far more people will be able to assist you if you are using command line than an GUI tool.
@@ Line 186: / Line 186: @@
 Done! Now go to your fork on GitHub and refresh, you’ll see something like “changes have recently been pushed to branch my-pr-that-does-something” with a big “Open pull request” button. Press that and make sure it’s going to the main repository. You can also do this manually from the Pull Requests tab on your fork.
 {{Contribution guides}}

Itsmeowdev: /* The Setup */ Remove protected email notice

2023-04-16T03:37:40Z

The Setup: Remove protected email notice

← Older revision		Revision as of 03:37, 16 April 2023
Line 9:		Line 9:
	Also be sure to set your name/email in your git client so your commits show properly and are attributed properly.		Also be sure to set your name/email in your git client so your commits show properly and are attributed properly.

	<code>git config --global user.name "Name Here"</code> <code>git config --global user.email ~~"[/cdn-cgi/l/~~email~~-protection <nowiki>[email protected]</nowiki>]~~"</code>		<code>git config --global user.name "Name Here"</code> <code>git config --global user.email "email here"</code>

	Often times the default can expose personal information. So be ''sure'' to set this.		Often times the default can expose personal information. So be ''sure'' to set this.
Line 186:		Line 186:

	Done! Now go to your fork on GitHub and refresh, you’ll see something like “changes have recently been pushed to branch my-pr-that-does-something” with a big “Open pull request” button. Press that and make sure it’s going to the main repository. You can also do this manually from the Pull Requests tab on your fork.		Done! Now go to your fork on GitHub and refresh, you’ll see something like “changes have recently been pushed to branch my-pr-that-does-something” with a big “Open pull request” button. Press that and make sure it’s going to the main repository. You can also do this manually from the Pull Requests tab on your fork.

	{{Contribution guides}}		{{Contribution guides}}

Itsmeowdev: Add contribution guides index

2023-03-29T03:30:45Z

Add contribution guides index

← Older revision		Revision as of 03:30, 29 March 2023
Line 186:		Line 186:

	Done! Now go to your fork on GitHub and refresh, you’ll see something like “changes have recently been pushed to branch my-pr-that-does-something” with a big “Open pull request” button. Press that and make sure it’s going to the main repository. You can also do this manually from the Pull Requests tab on your fork.		Done! Now go to your fork on GitHub and refresh, you’ll see something like “changes have recently been pushed to branch my-pr-that-does-something” with a big “Open pull request” button. Press that and make sure it’s going to the main repository. You can also do this manually from the Pull Requests tab on your fork.

			{{Contribution guides}}

Itsmeowdev: Add Map Merger page link

2023-03-29T03:20:37Z

Add Map Merger page link

← Older revision		Revision as of 03:20, 29 March 2023
Line 9:		Line 9:
	Also be sure to set your name/email in your git client so your commits show properly and are attributed properly.		Also be sure to set your name/email in your git client so your commits show properly and are attributed properly.

	<code>git config --global user.name "Name Here"</code> <code>git config --global user.email "~~youremail@example.com~~"</code>		<code>git config --global user.name "Name Here"</code> <code>git config --global user.email "[/cdn-cgi/l/email-protection <nowiki>[email protected]</nowiki>]"</code>

	Often times the default can expose personal information. So be ''sure'' to set this.		Often times the default can expose personal information. So be ''sure'' to set this.
Line 20:		Line 20:

	<span id="git-terms-cheat-sheet"></span>		<span id="git-terms-cheat-sheet"></span>

	== Git Terms Cheat-Sheet ==		== Git Terms Cheat-Sheet ==
	'''HEAD:''' Term for the current location on the “commit tree”, basically your current location in history.		'''HEAD:''' Term for the current location on the “commit tree”, basically your current location in history.
Line 130:		Line 129:
	If there are any conflicting tiles, you will be prompted to fix it in your map editor, then you can continue by committing the changes.		If there are any conflicting tiles, you will be prompted to fix it in your map editor, then you can continue by committing the changes.

	~~<span id="icon-conflicts"></span>~~		For more info, see [[Map Merger]].
	=== Icon Conflicts ===		=== Icon Conflicts ===
	DMI files contain multiple images, making merge conflicts ''always'' happen if the file is updated by two branches. This means solving them is relatively trivial but can be time consuming. So there’s a tool for it.		DMI files contain multiple images, making merge conflicts ''always'' happen if the file is updated by two branches. This means solving them is relatively trivial but can be time consuming. So there’s a tool for it.

Itsmeowdev: /* The Setup */ Email privacy

2023-03-29T02:50:39Z

The Setup: Email privacy

← Older revision		Revision as of 02:50, 29 March 2023
Line 13:		Line 13:
	Often times the default can expose personal information. So be ''sure'' to set this.		Often times the default can expose personal information. So be ''sure'' to set this.

	As long as the email you put is added to your GitHub account it will work fine and show your icon on commits. ~~Name can just be~~ your GitHub ~~username or something else, doesn’t matter~~.		Name can just be your GitHub username or something else, doesn’t matter.

			As long as the email you put is added to your GitHub account it will work fine and show your icon on commits. GitHub will also provide you with a private email, if you don't have any type of "business" email, it is recommended to use this.

			For more details on commit email privacy, read [https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address GitHub's guide].

	<span id="git-terms-cheat-sheet"></span>		<span id="git-terms-cheat-sheet"></span>

Itsmeowdev: /* The Setup */ Email moment

2023-03-29T02:48:37Z

The Setup: Email moment

← Older revision		Revision as of 02:48, 29 March 2023
Line 9:		Line 9:
	Also be sure to set your name/email in your git client so your commits show properly and are attributed properly.		Also be sure to set your name/email in your git client so your commits show properly and are attributed properly.

	<code>git config --global user.name "Name Here"</code> <code>git config --global user.email "~~[/cdn-cgi/l/email-protection <nowiki>[email protected]</nowiki>]~~"</code>		<code>git config --global user.name "Name Here"</code> <code>git config --global user.email "youremail@example.com"</code>

	Often times the default can expose personal information. So be ''sure'' to set this.		Often times the default can expose personal information. So be ''sure'' to set this.