You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/05-Workspace/06-git.md
+57-57Lines changed: 57 additions & 57 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -10,7 +10,7 @@ import VideoPlayer from '@site/src/components/Video/player';
10
10
11
11
**Phoenix Code** includes built-in Git support, allowing you to manage version control directly within the editor. Git can be accessed from the toolbar icon or the File menu in the menu bar.
In the Clone Repository dialog, clicking on `More Options` expands additional settings for authentication.
50
50
51
-

51
+

52
52
53
53
**Credentials**: This section allows you to enter your *username* and *password* for repositories that require authentication. Typically, if your credentials are already stored in a credential manager (like SSH keys or a Git credential manager), you don't need to fill in these fields.
54
54
@@ -61,38 +61,38 @@ In the Clone Repository dialog, clicking on `More Options` expands additional se
61
61
62
62
To initialize a Git repository in a project that doesn’t already have one, click on `File > Git > Init`. This will set up Git for your current project. After initialization, the Git icon will appear in the toolbar, indicating that version control is active.
> Note: *For projects without an existing Git repository, the Git icon won’t appear by default. To initialize or connect a Git repository, use the File menu to set up Git for your project.*
67
67
68
68
Once Git is set up, the Git Panel provides a user-friendly interface to manage version control. You can track changes, commit updates, interact with remote repositories, and more—all within the editor.
All files with changes are displayed in the Git panel along with their status, such as *Modified*, *Untracked*, and *Deleted*. For modified files, a Git diff button is available.
For *Modified* and *Deleted* file statuses, a `Discard Changes...` button is shown. Clicking it will reset the changes for *Modified* files and restore *Deleted* files.
88
88
89
89
For *Untracked* files, a `Delete File...` button is available. Clicking it will delete the file.
90
90
91
-

91
+

92
92
93
93
You can also discard all changes made to all files at once by clicking the three dots at the top-right and selecting the `Discard all changes since the last commit...` option. This will remove all modifications made since your last commit.
94
94
95
-

95
+

96
96
97
97
98
98
@@ -101,14 +101,14 @@ You can also discard all changes made to all files at once by clicking the three
101
101
When viewing a file with multiple Git changes, you can use the Next Change and Previous Change buttons to quickly move between modifications.
102
102
103
103
***Next Change**: Moves the cursor to the next change in the file.
104
-

104
+

105
105
106
106
***Previous Change**: Moves the cursor to the previous change in the file.
107
-

107
+

@@ -118,28 +118,28 @@ When viewing a file with multiple Git changes, you can use the Next Change and P
118
118
119
119
The **Refresh Panel** button ensures that the displayed repository information is up to date. While changes are usually updated automatically, this button helps in cases where the interface lags behind, ensuring all modifications are reflected correctly.
> The Commit input box also displays the number of characters in the commit message.
142
+
> The Commit input box also displays the number of characters in the commit message.
143
143
144
144
*If your commit message is longer, you can use the `Extended` button at the top-right of the dialog. This expands the input area, making it easier to write detailed commit messages.*
145
145
@@ -149,19 +149,19 @@ The commit dialog box also provides options to :-
149
149
150
150
> The Git commit dialog box also displays code inspection problems, if there are any:
To upload your local commits to the remote repository, use the `Push` option in the Git panel. This ensures your changes are synchronized with the remote repository.
@@ -178,7 +178,7 @@ When you initiate a push, the **Push to Remote** dialog appears, allowing you to
178
178
179
179
Clicking More Options expands additional push settings, allowing for more control over the push operation.
180
180
181
-

181
+

182
182
183
183
***Send tags**: If enabled, this option ensures that Git tags are pushed along with commits. If you have created tags locally and want them reflected in the remote repository, enable this option.
184
184
@@ -194,19 +194,19 @@ Clicking More Options expands additional push settings, allowing for more contro
194
194
195
195
To download the latest changes from the remote repository without modifying your local repository, use the `Fetch` option in the Git panel. This will pull the latest changes from the remote repository but does not update your working directory or merge the changes into your local branches.
To download the latest changes from the remote repository to your local machine, use the `Pull` option in the Git panel. This ensures your local repository is up to date with the latest changes from the remote repository.
Clicking the **Show History** button displays a complete list of commits made to the entire repository to help you track the changes made to the project over time.
Clicking the **Show File History** button displays the commit history of a specific file, showing all modifications since it was added to the repository.
Clicking the **Show File History** button displays the commit history of a specific file, showing all modifications since it was added to the repository.
241
241
242
242
### History Viewer
243
243
244
244
When selecting a specific commit from the history panel, the **History Viewer** appears, displaying all changes made in that commit.
* You can expand or collapse all files at once using the Expand All/Collapse All button.
254
254
@@ -262,11 +262,11 @@ This lets you inspect changes directly within the editor.
262
262
263
263
To create a new branch in Git, click on the `main > Create new branch...` button in the sidebar. The name shown (e.g., main) represents your current branch, so if you're on a different branch, it may display another name.

269
+

270
270
* Select the branch from which the new branch will originate.
271
271
* Enter a name for your new branch.
272
272
@@ -276,15 +276,15 @@ Once created, it automatically switches to the new branch and you can start work
276
276
### Merging a branch
277
277
278
278
To merge a branch into the current branch, click on the current branch name (e.g., main) in the sidebar. This will open a popup displaying all available branches.
279
-
To the right of each branch name, you'll see a merge icon.
279
+
To the right of each branch name, you'll see a merge icon.
***Target branch**: Displays the branch where the selected branch will be merged.
290
290
***Merge message**: Provides a default message for the merge, which you can edit.
@@ -297,7 +297,7 @@ This will open a merge dialog box with the following options:
297
297
298
298
To delete a local branch in Git, click on the current branch name (e.g., main) in the sidebar. This will open a dropdown menu displaying the list of all available branches.
***View Authors of File...**: Shows the commit history and contributors for the entire file.
369
369
370
370
### Committing Changes
@@ -390,17 +390,17 @@ Here are the available options in Git panel:
390
390
391
391
## Git Settings
392
392
393
-
The Git Settings dialog provides options to configure Git behavior within the application. To open the Git Settings dialog, go to `File > Git > Git Settings...`.
393
+
The Git Settings dialog provides options to configure Git behavior within the application. To open the Git Settings dialog, go to `File > Git > Git Settings...`.
394
394
395
-

395
+

396
396
397
397
Alternatively, you can access it from the Git panel by clicking the three dots in the top right corner and selecting `Git Settings...`.
398
398
399
-

399
+

0 commit comments