hello-world/GitSteps.html at main · nancymunoz/hello-world · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
/*************  ✨ Windsurf Command ⭐  *************/
<!DOCTYPE html>
<html>
<head>
	<title>GitSteps</title>
</head>
<body>
<h1>GitSteps</h1>
<h2>How to add a new file to a repo using a new branch and merging it back to main from within VS Code</h2>

<ol>
	<li>Open VS Code in the folder containing your repo</li>
	<li>Open the Command Palette by pressing <code>Ctrl + Shift + P</code></li>
	<li>Type "Git: Create Branch" and select <code>Git: Create Branch</code></li>
	<li>Name the new branch (e.g. <code>new-file</code>) and press <code>Enter</code></li>
	<li>Add the new file in the new branch</li>
	<li>Open the Command Palette again and type "Git: Stage All" and select <code>Git: Stage All</code></li>
	<li>Commit the changes by typing a commit message and pressing <code>Enter</code></li>
	<li>Type "Git: Checkout to" and select <code>Git: Checkout to...</code></li>
	<li>Select the main branch (e.g. <code>main</code>) and press <code>Enter</code></li>
	<li>Type "Git: Merge Branch" and select <code>Git: Merge Branch...</code></li>
	<li>Select the new branch (e.g. <code>new-file</code>) and press <code>Enter</code></li>
	<li>Resolve any conflicts and commit the merge</li>
</ol>
</body>
</html>
/*******  ae9931fd-6879-4fa3-9204-59d859dc46d6  *******/