Skip to content

Comments

adanbh's solution for git_ex1#27

Open
AdanBhsas wants to merge 1 commit intomainfrom
git_ex1/adanbh
Open

adanbh's solution for git_ex1#27
AdanBhsas wants to merge 1 commit intomainfrom
git_ex1/adanbh

Conversation

@AdanBhsas
Copy link
Collaborator

No description provided.

@AdanBhsas AdanBhsas closed this May 24, 2022
@AdanBhsas AdanBhsas reopened this May 24, 2022
@@ -0,0 +1,47 @@
1. create a file in branch main, that called "abc.txt".
2. the file color in Pycharm's Project view is green.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file should be red since it's not in the index yet.

15. 1.git restore --staged abc.txt
2.git status
======================================
Resolve conflicts
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great

6. yes, Untracked file feature/
======================================
Cherry picking
4. config.json , .env
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great

5. no
6. no there is no take.txt in the branch ,Force Checkout button destroyed the file.
========================================
Reset
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants