Git Challenge VII

-

Git Challenge VII

 

This challenge asks you to create a branch, make some modifications on that branch, and force Git to not perform a fast-forward merge. The high-level steps for this task are: 1. Ensure you’re on the `main` branch.
2. Create a branch named `contact-details`.
3. Switch to that branch.
4. Edit the README.md file and add the following text to the end of the file: "Contact: support@razeware.com".
5. Save your edits to the file.
6. Stage your changes.
7. Commit your changes with an appropriate commit message, such as "Adding README contact information".
8. Switch back to the `main` branch.
9. Pull up the graph of the repository, and don’t forget to use the `--all` option to see history of all branches. Make note of how `main` and `contact-details` look on this graph.
10. Merge in the changes from `contact-details`, using the `--no-ff` option.
11. Enter something appropriate in the merge message in Vim when prompted. Use the cheatsheet above to help you navigate through Vim if necessary.
12. Pull up the graph of the repository again. How can you tell that this is a merge commit, and not a fast-forward commit?


SOLUTION


Here are the steps I followed to complete this challenge. You may have used slightly different methods to accomplish the same result, but here’s how I did it:

- git checkout main
- git checkout -b contact-details
- There’s no need to explicitly switch to that branch; git checkout -b does this for you
- I edited README.md in nano and saved my changes.
- git add README.md
- git commit -m "Adding README contact information"
- git checkout main
- git log --graph --oneline --all
- This shows me the following:

* 75e1886 (contact-details) Adding README contact information
* 78eefc6 (HEAD -> main, readme-updates) Adding more detail to the README file
*   55fb2dc Merge branch 'clickbait'
|\
| * e69a76a (origin/clickbait, clickbait) Adding suggestions from Mic


- git merge contact-details --no-ff
- git log --graph --oneline --all
- This shows me the following:

*   f5c54f0 (HEAD -> main) Merge branch 'contact-details'
|\
| * 75e1886 (contact-details) Adding README contact information
|/
* 78eefc6 (readme-updates) Adding more detail to the README file
*   55fb2dc Merge branch 'clickbait'
|\
| * e69a76a (origin/clickbait, clickbait) Adding suggestions from Mic

You can tell this is a merge commit, since Git created a new commit (f5c54f0) to merge the changes from the contact-details branch (75e1886). Plus the graphical representation shows the branch structure.

Had you chosen to *not* create a merge commit, and instead do a fast-forward commit, your repository graph would have looked like the following:

* 75e1886 (HEAD -> main, contact-details) Adding README contact information
* 78eefc6 (readme-updates) Adding more detail to the README file
*   55fb2dc Merge branch 'clickbait'
|\
| * e69a76a (origin/clickbait, clickbait) Adding suggestions from Mic

Comments

Post a Comment

Popular posts from this blog

HOW TO GET FREE WEB HOSTING FOR WEBSITE BY FAHIM KHAN

-
Image
Hi Guys, This is Fahim Khan here. Welcome to My blog In This blog i'll be telling you about how you can get a free Hosting and Sub-domain For your Website, All For 100% Free Legit way to get your website up and running. How to get FREE Web HOSTING? 000webhost  provides you the Free Hosting All you need to do is Just Click on the link and Create your Free Account. I think this information can be useful for you. If you plan to get your website, here is one good free web hosting provider to choose - 000webhost.com  They provide hosting absolutely free, there is no catch. You get 1500 MB of disk space and 100 GB bandwidth. They also have cPanel control panel which is amazing and easy to use website builder. Moreover, there is no any kind of advertising on your pages. You can register here: https://www.000webhost.com/1084318.html What is free web hosting? How is it different from paid hosting? Free hosting allows you to host a limited number of website and comes wi
Read more

Demystifying Java: Your Journey to Coding

-
Image
Have you ever wondered how the cool apps you use are built? Well, Java is a powerful programming language behind many of them! Today, we'll embark on a beginner-friendly adventure to understand its basics. Learning the ABCs:  The Fundamentals of Java Imagine Java as a set of instructions a computer can understand. Just like you follow steps to build a Lego set, Java code gives clear instructions to create programs. We'll start by learning these essential building blocks: Variables : These are like tiny boxes that hold information you use in your code, like numbers or text. Operators : Think of them as tools. You can use them to add, subtract, compare, and perform other calculations on the information stored in your variables. Control Flow : This is like the traffic lights in your code. It decides what happens next based on certain conditions. Object-Oriented Playground:  Building with Classes and Objects Imagine a blueprint for a car. This blueprint defines the car's parts
Read more

Git Challenge V

-
  Git Challenge V Challenge 1: Show all the details of commits that mark items as “done” For this challenge, you need to find all of the commits where items have been ticked off as “done”; that is, ones that have an “x” inside the brackets, like so: `[x]` Solution You’ll need to search for the above string, and you’ll need to use an option to not only show the basic commit details but also show the contents of the changeset of the commit. To do this, use the search flag "-S" with git log, and also include the "-p" flag to see the contents of each commit: git log -p -S"[x]" Challenge 2: Find all the commits with messages that mention “streaming” You want to search through the commit **messages** to find where you or someone else has used the term “streaming” in the commit message itself, not necessarily in the content of the commit. Tip: What was that strangely named command you learned about earlier in this chapter? Solution Right, you want to use "
Read more