**Course Title:** Version Control Systems: Mastering Git **Section Title:** Advanced Git Techniques **Topic:** Practice using rebase and stash in a collaborative project.(Lab topic) **Introduction** In this lab topic, you will practice using `git rebase` and `git stash` in a collaborative project. You will apply the concepts learned in the previous topics to manage your changes and collaborate with others. This hands-on exercise will help you understand how to use rebase and stash in real-world scenarios. **Objective** By the end of this lab, you will be able to: 1. Use `git rebase` to manage your changes and collaborate with others. 2. Use `git stash` to temporarily save your changes and apply them later. 3. Understand how to use rebase and stash in a collaborative project. **Step 1: Create a new repository and initialize a branch** Create a new repository on GitHub or GitLab and clone it to your local machine. Initialize a new branch, e.g., `feature/new-feature`. ```bash # Create a new repository on GitHub or GitLab # Clone the repository to your local machine git clone <repository-url> # Initialize a new branch git checkout -b feature/new-feature ``` **Step 2: Make changes and commit** Make changes to a file, e.g., `README.md`, and commit them. ```bash # Make changes to README.md echo "Added a new feature" >> README.md # Commit the changes git add . git commit -m "Added a new feature" ``` **Step 3: Create a pull request and let others review your changes** Push your changes to the remote repository and create a pull request. Let others review your changes. ```bash # Push your changes to the remote repository git push -u origin feature/new-feature # Create a pull request # Follow the instructions on GitHub or GitLab to create a pull request ``` **Step 4: Use `git rebase` to manage changes** While waiting for others to review your changes, you realize that there are some changes in the `main` branch that you want to include in your `feature/new-feature` branch. Use `git rebase` to manage your changes. ```bash # Fetch the latest changes from the remote repository git fetch origin # Use git rebase to manage changes git rebase origin/main ``` **Step 5: Resolve conflicts** There may be conflicts between your changes and the changes in the `main` branch. Resolve the conflicts and continue with the rebase process. ```bash # Resolve conflicts # Edit the files to resolve conflicts # Continue with the rebase process git add . git rebase --continue ``` **Step 6: Use `git stash` to temporarily save changes** While working on a new feature, you receive an urgent task that requires your immediate attention. Use `git stash` to temporarily save your changes and work on the urgent task. ```bash # Temporarily save your changes git stash # Work on the urgent task # Make changes and commit them # Apply your stashed changes git stash pop ``` **Conclusion** In this lab topic, you practiced using `git rebase` and `git stash` in a collaborative project. You learned how to use rebase to manage your changes and collaborate with others. You also learned how to use stash to temporarily save your changes and apply them later. **Practice Exercises** 1. Create a new repository and initialize a branch. Make changes and commit them. Use `git rebase` to manage your changes. 2. Create a new repository and initialize a branch. Make changes and use `git stash` to temporarily save them. Apply your stashed changes later. 3. Collaborate with others on a project. Use `git rebase` and `git stash` to manage your changes and collaborate with others. **Additional Resources** * Git documentation: [https://git-scm.com/docs](https://git-scm.com/docs) * GitHub documentation: [https://docs.github.com/en](https://docs.github.com/en) * GitLab documentation: [https://docs.gitlab.com/ee/](https://docs.gitlab.com/ee/) **Leave a comment/Ask for help** If you have any questions or need help with this lab topic, please leave a comment below. We will respond to your questions and provide help as needed. **What's next?** In the next topic, we will cover 'Git LFS (Large File Storage) for handling large files.' From: Managing Large Projects with Git.