What Is A Merge Conflict In Git And How Can It Be Resolved
A Git merge conflict happens when you have merge branches with competing for commits, and Git needs your help to decide which changes to incorporate in the final merge.
Manually edit the conflicted file to select the changes that you want to keep in the final merge.
Resolve using GitHub conflict editor
This is done when a merge conflict is caused after competing for line changes. For example, this may occur when people make different changes to the same line of the same file on different branches in your Git repository.
- Resolving a merge conflict using conflict editor:
- Under your repository name, click “Pull requests.”
- In the “Pull requests” drop-down, click the pull request with a merge conflict that you’d like to resolve
- Near the bottom of your pull request, click “Resolve conflicts.”
- Delete the conflict markers < < < < < < < , =======, > > > > > > > and make changes you want in the final merge.
- If you have more than one merge conflict in your file, scroll down to the next set of conflict markers and repeat steps four and five to resolve your merge conflict.
- Once you have resolved all the conflicts in the file, click Mark as resolved.
- If you have more than one file with a conflict, select the next file you want to edit on the left side of the page under “conflicting files” and repeat steps four to seven until you’ve resolved all of your pull request’s merge conflicts.
- Delete the conflict markers “< < < < < < < “, “=======”, “> > > > > > > ” and make the changes you want in the final merge.
What Is Git Stash
A developer working with a current branch wants to switch to another branch to work on something else, but the developer doesn’t want to commit changes to your unfinished work. The solution to this issue is Git stash. Git stash takes your modified tracked files and saves them on a stack of unfinished changes that you can reapply at any time.
Explain The Term Profiling During Performance Testing
Profiling is an identification process that picks out the issues impeding the optimal operation of a softwares functionalities. During performance testing, profiling helps identify the smallest performance defects that may not be fully expatriated during the test. All the details of such issues are brought to light, including their location, programming structure, type, size, etc.
Read Also: What To Know About Sql For An Interview
Why Are Ssl Certificates Used In Chef
- SSL certificates are used between the Chef server and the client to ensure that each node has access to the right data.
- Every node has a private and public key pair. The public key is stored at the Chef server.
- When an SSL certificate is sent to the server, it will contain the private key of the node.
- The server compares this against the public key in order to identify the node and give the node access to the required data.
Explain The Different Types Of Performance Tuning
There are two types of performance tuning, namely: Hardware tuning and Software tuning.
Hardware tuning is the process of improving the physical structure of a system, which can include its physical design, its skeletal construction, its ports, its antennas, its lighting systems, etc.
Software tuning is the process of improving the performance levels of digital software. As explained earlier, software tuning has to do with re-writing codes, enlarging storage capabilities, readjusting networking capabilities, improving internal compatibility, improving endurance levels, introducing immunity to some areas, etc.
We all understand the difference between hardware and software, so the above tuning comparison should be easy to grasp.
Read Also: Hr Director Interview Questions And Answers For Experienced Candidates
What Is Git Bisect How Can You Use It To Determine The Source Of A Bug
Git bisect is a tool that uses binary search to locate the commit that triggered a bug.
Git bisect command –
git bisect < subcommand> < options>
The git bisect command is used in finding the bug performing commit in the project by using a binary search algorithm.
The bug occurring commit is called the bad commit, and the commit before the bug occurring one is called the good commit. We convey the same to the git bisect tool, and it picks a random commit between the two endpoints and prompts whether that one is the good or bad one. The process continues uptil the range is narrowed down and the exact commit that introduced the exact change is discovered.
Manual Testing Interview Questions For Experienced
Ques.89. What is the difference between bug leakage and bug release?Ans. Bug leakage is when the tested software is released into the market and the end-user finds bugs in it. These include the bugs that got missed by the testing team during the testing phase.Whereas, bug release is when a specific version of the software is released in the market with some known bugs which are intended to get fixed in later versions. These types of issues are of low priority and are mentioned in the release notes while sharing with the end-users.
Ques.90. What do you mean by Defect Triage?Ans. Defect triage is a process in which the defects are prioritized based on different factors like severity, risk, the time required to fix the bug, etc. The defect triage meeting includes the different stakeholders the development team, testing team, project manager, BAs, etc, which decide the priority of fixing the defects.
Ques.91. What is a test harness? Why do we need a test harness?Ans. A test harness is a collection of test scripts and test data usually associated with the unit and integration testing. It involves stubs and drivers that are required for testing software modules and integrated components.
Ques.92. What is all pair testing?Ans. All pair testing is a type of testing in which the application is tested with all possible combinations of the values of input parameters.
Also check Agile interview questions Top agile methodology interview questions
Don’t Miss: What To Expect In A Phone Interview
What Is A Robolectric Testing Framework
Testing applying the Android Testing framework with a device or an emulator is challenging. It takes the teams tremendous development effort and time in building and running tests. And the Robolectric testing framework is considered as a solution to address this challenge.
Robolectric framework allows testers to run Android tests directly on JVM without a device or an emulators need.
How Does Endurance Testing Differ From Spike Testing
These two tests are similar but have their differences.
Endurance testing has to do with time. It checks how long a software can operate at an optimal level, while spike testing has to do with a quick sharp rise in the softwares operational status. It checks software by pressing towards its highest possible operating level. One can say that spike testing has to do with reaching the highest operating limits, while endurance testing has to do with how long it will take for the software to be affected by its operations.
Endurance testing doesnt have to depend on the amount of data being processed by the software. It depends on time. While spike testing can depend on the amount of data being processed, it does not rely on the time taken.
| Endurance Test | Spike Test |
|---|---|
| We dont test memory leaks |
Don’t Miss: Aws Cloud Engineer Interview Questions And Answers
In The Case Of Performance Testing Mention The Entering And Exiting Criteria
The starting of performance testing is done at the design level only. After the testing is done, results are collected, and later they are analyzed in order to make improvements regarding the performance. During the whole process of life cycle development, performance tuning is done and the factors on which it is based are scalability and reliability during the presence of the load, application release time and tolerance criteria of performance and stress.
How Will You Overcome The Challenges Faced Due To The Unavailability Of Proper Documentation For Testing
If the standard documents like System Requirement Specification or Feature Description Document are not available, then QAs may have to rely on the following references, if available.
- A previous version of the application
Another reliable way is to have discussions with the developer and the business analyst. It helps in solving the doubts, and it opens a channel for bringing clarity on the requirements. Also, the emails exchanged could be useful as a testing reference.
Smoke testing is yet another option that would help verify the main functionality of the application. It would reveal some very basic bugs in the application. If none of these work, then we can just test the application from our previous experiences.
Also Check: Devops Interview Questions Preparation Course
What Is Soak Testing In Performance Testing
Expecting a continual increase in the load, system resources are monitored with their performances getting affected with load increase. In the due course of the time any data leak is monitored and the memory management is observed to make sure, performance does not affect any of the memory constraints and no data loss happens.
What Is A Performance Bottleneck And What Is Your Approach To Avoiding Them
A performance bottleneck is a common concept in website and software testing, and recruiters may ask about them to analyse your approach to addressing them. Begin by describing the various types of performance bottlenecks to convey your familiarity in this area, then you can provide your preferred strategy for resolving them. A well-explained answer can showcase your ability to provide solutions to common software issues to the interviewer.
Example:’Aperformance bottleneck occurs when the data’s processing rate doesn’t meet the specified system requirements. I have experience in this area from my last employment, where we had an instance of memory bottlenecking as our website expanded. From that experience, I would say that the best prevention is to upgrade the physical servers. Making code adjustments to maximise the software can also be invaluable. Then, to prevent the bottlenecks from reoccurring, I would monitor our resources using APM tools.’
Recommended Reading: How Many Real Estate Agents Should I Interview
What Is The Role Of Aws In Devops
AWS has the following role in DevOps:
- Flexible services – Provides ready-to-use, flexible services without the need to install or set up the software.
- Built for scale – You can manage a single instance or scale to thousands using AWS services.
- Automation – AWS lets you automate tasks and processes, giving you more time to innovate
- Secure – Using AWS Identity and Access Management , you can set user permissions and policies.
- Large partner ecosystem – AWS supports a large ecosystem of partners that integrate with and extend AWS services.
Explain The Most Common Performance Issues
The software might be too slow to respond. The software might have a repetitive loop. The software may be shutting down whenever it gets to a certain point of operation or hanging uncontrollably. It might have an insufficient amount of storage. The software might also simply not be compatible with a particular operating system or device version.
These issues are generally due to various factors, including an increase in the amount of data being processed, how long the software had been running, the available connectivity level, the network established between the software and an external source, etc.
You May Like: What Questions To Ask In An Interview For Administrative Assistant
Describe The Term Bottlenecks In A Software
Bottlenecks are the performance issues faced by software. As explained earlier, the commonly encountered bottlenecks are:
- When software might be too slow to respond.
- The software might have a repetitive loop.
- The software may be shutting down whenever it gets to a certain point of operation.
- The software might be hanging uncontrollably.
- The software might have an insufficient amount of storage.
- The software might not be compatible with a particular operating system or device version
All these issues can be referred to as Bottlenecks.
What Do You Mean By Concurrent User Hits In Case Of Load Test
There may arise a situation when more than one user will hit on the same event of the application during load testing and this situation is referred to as concurrent user hit. There is the addition of these concurrency points. This is done so that the virtual multiple users would be able to work in a single event of application.
Don’t Miss: How To Properly Interview Someone
What Are The Resources In Puppet
- Resources are the basic units of any configuration management tool.
- These are the features of a node, like their software packages or services.
- A resource declaration, written in a catalog, describes the action to be performed on or with the resource.
- When the catalog is executed, it sets the node to the desired state.
What Is The Purpose Of The End
End-to-end testing is a testing strategy to execute tests that cover every possible flow of an application from its start to finish. The objective of performing end-to-end tests is to discover software dependencies and to assert that the correct input is getting passed between various software modules and sub-systems.
Read Also: How To Nail A Job Interview
Prepare Questions To Ask The Interviewer
Many interviews end with the interviewer asking the candidate if they have any questions about the job. Asking questions about the job demonstrates that youâre engaged and want to know more about working there. Try asking questions about the work environment or the type of projects youâll be working on. It can also help to before the interview so that you can ask more in-depth questions about your role.
In Your Experience What Was The Most Important Aspect Of The Logs You Kept
Log Management Dashboard in Logz.io
Every appand every industryhas its own particular needs. Each app will have its own predefined goals that will inform how you structure your logs. For more info on this, including log frameworks, deciding what to log, and formatting, check out our logging best practices.
Common follow-up questions:
1. How do you display systemd logs? 2. What is the difference between Filebeat and Logstash? 3. What are ingest nodes in Elasticsearch?
Read Also: What Questions To Ask As The Interviewer
What Are Performance Bottlenecks And How Do You Avoid Them
Bottlenecking is a common concept in software and website testing, so interviewers may ask about how you address them during the testing process. Describe the different types of performance bottlenecks to show your expertise, then explain a basic strategy for preventing them to show your knowledge of system functions.
Example: “Performance bottlenecking happens when one of the software or hardware system elements slows down the behavior of the entire system. In a past position, we experienced both CPU and memory bottlenecking when our website grew, which required us to upgrade our physical servers. We also had to adjust our code to fully use all software. To prevent bottlenecks in the future, I started monitoring our resources continuously with APM tools.”
Related: Learn About Being a Software Developer
Is There Any Difference Between Retesting And Regression Testing
Possible differences between retesting and regression testing are as follows:
- We perform retesting to verify the defect fixes. But, the regression testing assures that the bug fix does not break other parts of the application.
- Regression test cases verify the functionality of some or all modules.
- Regression testing ensures the re-execution of passed test cases. Whereas, retesting involves the execution of test cases that are in a failed state.
- Retesting has a higher priority over regression. But in some cases, both get executed in parallel.
Don’t Miss: How To Schedule An Interview Email
What Do You Know About Scalability Testing
Scalability testing is a type of performance testing that analyzes how well the software is capable of handling complex operational capacity from a simple capacity. Some software takes time to adapt to complex capacities. This testing ensures that the application can scale quickly without any glitches or drawbacks.
Differentiate Between Functional Testing And Performance Testing
Functional testing involves checking whether the different software functionalities are doing what they were initially programmed to do. For instance, can a calculator software perform essential functions like addition, subtraction, etc.?
In the case of Performance testing, the correct functionalities are analyzed to determine how well they perform. For instance, those essential calculator functions we stated earlier might be operating at a very slow rate. The calculators core might not synchronize well with the basic functions, causing a glitch.
Don’t Miss: Best Interview Questions To Ask Potential Employees
What Cloud Environments Can Your Solution Natively Integrate With
Some APM solutions are designed specifically to integrate with a cloud environment like Amazon Web Services, Microsoft Azure, or Google Cloud Platform. If your company deploys apps in any cloud environment, it would be beneficial to look for solutions that can natively integrate with the cloud platforms you deploy applications in. This way, you can ensure your APM vendor has knowledge and expertise in delivering APM features tailored to those cloud environments.
Looking for a solution to help you improve your network performance? Our Network Monitoring Buyers Guide contains profiles on the top network performance monitor vendors, as well as questions you should ask providers and yourself before buying.
Check us out on for the latest in Network Monitoring news and developments!
What Are The Common Challenges In Mobile Application Testing Faced By Most Testers
- Executing test cases with various operating systems
- Testing applications functionalities on a wide range of handsets
- Screen size fragmentation
- Testing applications on different mobile networks
- Different application types require different ways to test
- The choice of the right mobile testing tool for QA team
You May Like: How To Do A Group Interview
Explain The Term Throughput
This refers to the number of operations carried out by software in relation to the time frame within which such operations are performed. For instance, for a call software, the amount of incoming and outgoing calls per second, per minute, per day, per week, per month, or per year, all represent the softwares throughput. Thus, one can firmly state that the throughput of software is equal to the operation amount divided by the time taken during the operation.
