git commands

Basic commands:

git status

git add .

git commit -m "Message about recent change"

git push

git init: Initializes a new Git repository in the current directory.

git init

git clone [repository URL]: Clones a remote repository onto your local machine.

git clone https://github.com/example/repository.git

git add [file]: Adds a file or changes in a file to the staging area, preparing them to be committed.

git add filename.txt

git remote -v

git commit -m "[commit message]": Commits the staged changes to the local repository along with a commit message.

git commit -m "Add new feature"

git push: Pushes committed changes from your local repository to the remote repository.
```
git push origin master
```
git pull: Fetches and merges changes from the remote repository into your local repository.
```
git pull origin master
```
git status: Displays the current status of the repository, including tracked/untracked files and changes.
```
git status
```
git log: Shows a history of commits in the repository, including commit hashes, authors, dates, and commit messages.
```
git log
```
git branch: Lists all branches in the repository.
```
git branch
```
git checkout [branch name]: Switches to the specified branch.
```
git checkout branchname
```
git merge [branch name]: Merges changes from the specified branch into the current branch.
```
git merge branchname
```
git stash: Temporarily shelves changes you've made to your working directory so you can work on something else, and then come back and re-apply them later.
```
git stash
```
git reset: Resets the current HEAD to the specified state. It can be used to undo changes or move the HEAD to a different commit.
```
git reset --hard HEAD~1
```
git remote -v: Lists the remote repositories associated with the local repository along with their URLs.
```
git remote -v
```
git fetch [remote]: Fetches changes from the remote repository without merging them into your working branch.
```
git fetch origin
```

These examples demonstrate the usage of each Git command with basic arguments. Depending on your specific scenario and workflow, you may need to use additional options and flags with these commands. Always refer to the Git documentation or use git help [command] for more information on a particular command.

Got it. Since you are currently on the main branch and you want your changes to be reflected in the expert-feedback branch, you need to switch to the expert-feedback branch and merge the main branch into it. Here are the steps:

Ensure your current changes are committed on the main branch:
```
git add .
git commit -m "Your commit message"
```
Fetch the latest changes from the remote repository:
```
git fetch origin
```
Switch to the expert-feedback branch:
```
git checkout expert-feedback
```
Merge the main branch into expert-feedback:
```
git merge main
```
Resolve any conflicts if there are any. After resolving, stage the resolved files:
```
git add <file_name>
```

Commit the merge:

git commit -m "Merged changes from main into expert-feedback"

Push the updated expert-feedback branch to the remote repository:
```
git push origin expert-feedback
```

By following these steps, you will ensure that the changes made on the main branch are reflected in the expert-feedback branch.

git fetch origin
git checkout s2-work
git merge origin/main

git status
git add .
git commit

in the main branches I added some Python file, I need those changes in another branch

To resolve the error related to the swap file, you need to handle the existing swap file properly. Here are the steps to follow:

Delete the Swap File:
- Since the recovery is not successful and the file is no longer available, you should delete the swap file to avoid future issues.
- Use the following command to delete the swap file:
  rm /Users/tactlabs2/tact/sanjayspace/data-validation/.git/.MERGE_MSG.swp
Retry the Git Merge:
- After deleting the swap file, you can retry the git merge origin/main command.

Here is a step-by-step guide:

Open your terminal.

Delete the swap file by running:

rm /Users/tactlabs2/tact/sanjayspace/data-validation/.git/.MERGE_MSG.swp

Verify the deletion to ensure the swap file is removed:
```
ls /Users/tactlabs2/tact/sanjayspace/data-validation/.git/.MERGE_MSG.swp
```
This command should return nothing if the file has been successfully deleted.
Retry the git merge command:
```
git merge origin/main
```

These steps should clear the swap file conflict and allow you to proceed with the merge operation. If you still encounter issues, ensure that no other processes are running that might be interfering with your files.

PreviousPandas basic scenarios Nextselenium

Last updated 1 year ago