Phone

+919997782184

Email

support@roboticswithpython.com

Geeks of Coding

Join us on Telegram

Viewing 0 reply threads
  • Author
    Posts
    • #1114
      Abhishek TyagiAbhishek Tyagi
      Keymaster

      Q 1) When we merge two branches, one of the two algorithms is used. If the branches have diverged, which algorithm is used?

      Answer-
      three-way merge

      Q 2) The following code snippet represents the result of a merge conflict. Edit the code to fix the conflict and keep the version represented by the current branch.

      Answer-
      print("Keep me!")

      Q 3) What command would we use to throw away a merge, and start over?

      Answer-
      git merge –abort

      Q 4) How do we display a summarized view of the commit history for a repo, showing one line per commit?

      Answer-
      git log –graph –oneline

      Q 5) The following script contains the result of a merge conflict. Edit the code to fix the conflict, so that both versions are included.

      Answer-

      def main():
          print("Start of program>>>>>>>")
          print("End of program!")
      main()
Viewing 0 reply threads
  • You must be logged in to reply to this topic.