Git Console

Using Git Console

• Navigate to the Notebook tab of an activated Repo Sync Project.

• Select a .ipynb file from the Repo Sync Project.

• The file content opens.

• Edit the displayed script.

• Click the Save icon.

• A notification message appears to ensure that the script has been saved.

• Navigate to Git Repository.

• Access the same script on the Git Repository.

• Click the Edit tab to open the script in the editable format.

• Modify or change the existing script.

• Click the Commit changes option.

• The Commit changes window opens.

• Provide a Commit message and choose a branch to commit your changes.

• Click the Commit changes option.

• Your changes get commited to the script.

• Navigate to the DSL repo sync project and click the Console icon.

• The Git Console space opens.

• Use the Git commands to get the latest updates for the script.

  • git status, git add, and git commit commands are used in the given image:

• The next used Git command is git push.

• The displayed warning in the given image indicates that the push command is rejected as the remotely saved script has some recent changes, therefore the user is advised to first pull the remote changes before pushing the script.

• The below given image displays the Pull command used in the Git space.

• The ending lines indicates that there is conflict in the selected script, so the user must fix the conflict and merge the result.

• The file title appears in red color to indicate the conflict.

• The cells containing conflicted content get highlighted in the script.

• Click the Delete icon for the conflicted cells.

• The Delete Cell window appears.

• Click the Yes option.

• A notification message appears to ensure that the conflicted cell is removed from the script.

• Click the Save icon for the script.

• A notification message appears to ensure that the script is saved.

• The saved script reflects the remote changes.

• The color of the selected file title also gets changed.

• By hovering on the file name, it displays the current status of the file. E.g., the given image displays that for the current file conflicts are resolved, but it is in uncommitted status.

• Click the Git Console icon.

• The Git Console space gets displayed.

• The used Git commands in the given example are git add, git commit, and git push.

• Navigate to the script saved remotely (in the Git repository).

• The script displays the recent changes committed by using the Git Console space for a Repo Sync Project.

Commonly used Git Commands

All the Git commands will be supported in the Git Console. Please find some of the commonly used Git commands listed below.

1. git init: #Initializes a new Git repository in the current directory
2. git status: #Displays the status of changes as untracked, modified, or staged.
3. git log: #Displays a commit history with commit IDs, authors, dates, and messages.
4. git log --stat: #Displays commit logs with the list of modified files and the number of lines that have been added or removed in each file.
5. git config --list: #Displays the Git configuration settings.
6. git add file1 file2 directory/: #Stage specific files or directories for the next commit.
7. git add --all: #Stages all changes, including untracked files, for the next commit.
8. git commit -m “Your commit message”: #Commits the staged changes with a descriptive message.
9. git push origin branch_name: #Pushes commits from your local branch to the remote repository's branch.
10. git fetch: #Fetches changes from the remote repository, but do not merge them into your local branch.
11. git remote -v: #Lists remote repositories linked to the local repository.
12. git merge branch_name: #Merges changes from another branch into your current branch.
13. git pull origin branch_name: #Fetches changes from the remote repository and merge them into your current branch.
14. git branch: #Lists all local branches.
15. git checkout branch_name: #Switches to an existing branch.
16. git switch branch_name: #Switch to an existing branch.
17. git checkout -b new_branch_name: #Create a new branch and switch to it in one step.
18. git diff: #Show changes between commits, commit and working tree, etc. 
19. git reset HEAD file: #Unstages/Resets changes for a specific file, but keep the changes in your working directory.
20. git reset --soft HEAD^: #Undo the last commit, but keep the changes from that commit staged.
21. git reset --hard HEAD^: #Undo the last commit and discard all changes made in that commit.
22. git rm: #Removes a file from the working directory and stages the removal.