Skip to main content

Git Branching

If you use Git version control system then following commands may come handy for creating new branch for selenium tests -

Create new branch and commit tests/features to branch – 

git checkout –b <branchname>

Work on branch and commit

git commit –m “developed awesome feature” 

Merge branch to your local master

git checkout master

pull if remote master is updated and then merge the branch

git pull

If you want to avoid creation of merge commit then rebase else merge and push to remote master

git pull --rebase
 
git merge <branchname>
 
git push

Once done with branch then delete it

git branch –d <branchname>

If you want local branch to be pushed to git so that more than one committer could work on it

git push -u origin <branchname>
If origin does not have a <branchname>, then it is created on the fly. The -u tells git that you want to be able to easily push and pull changes to that branch in the future. This is needed when multiple committers are working on same branch
Now you can commit changes to remote local branch.

If another committer wants to use the <branchname>

git fetch origin
 
git checkout --track origin/<branchname>

The first command updates repository with the changes from the remote repository. The second command creates a local branch  that matches the origin/plugin branch and tells git that new committer wants to be able to easily push and pull from the branch on GitHub.

Deleting branch locally and from git 

git branch –d <branchname>
 
git push origin --delete <branch name>

In case there are conflicts when merging branch to master

  • Resolve conflicts manually
  • git commit
The commit message would be like this “””Merge branch 'branch name’””” and the push -
  • git push

Comments

Popular posts from this blog

Using xPath to reach parent of an element

Note: If you are new to java and selenium then start with selenium java training videos .   I prefer css locator over xPath but there are times when css locators don't fit requirement. One such requirement is when you want to navigate to parent element of an element and may be parent of parent and even more. Unfortunately css locators don't provide any mechanism to navigate to parent of an element. See this for more. Of late I came across a scenario when I wanted to click on a link depending upon the text in a text box. Herein parent of text box and parent of link were at the same location. More over there could have been many such combinations in application. Fortunately I just need to pick first such instance and Web Driver any way considers only first instance when multiple locators are found matching an element. Element in question is in following html - Here I need to click on highlighted anchor on the basis of input element (which is also hig...

Selenium Tutorial: Ant Build for Selenium Java project

Ant is a build tool which could be used to have your tests running either from command line or from Hudson CI tool. There is detailed documentation available for ant here but probably you need to know only a little part of it for you selenium tests. The essentials which are needed to know are: Project Target (ant execution point and collection of tasks) Tasks (could be as simple as compilation) And there would usually be following targets for Selenium tools - setClassPath - so that ant knows where you jar files are loadTestNG - so that you could use testng task in ant and use it to execute testng tests from ant init - created the build file clean - delete the build file compile - compiles the selenium tests run - executes the selenium tests Here is my project set up for ant -

Verify email confirmation using Selenium WebDriver

Note: If you are new to java and selenium then start with selenium java training videos .   How to Verify Email Confirmation Using Selenium 4 and JavaMail (2026 Guide) Email confirmation is a critical part of most registration flows — account activation, password reset, multi-factor authentication, and onboarding. Every automation engineer eventually faces the same challenge: How do you verify an email confirmation link inside a Selenium test without making it slow and flaky? The wrong instinct is to automate Gmail's UI with Selenium. It's fragile, slow, and breaks constantly. The right approach: Use Selenium for browser automation Use JavaMail (IMAP) to read the email directly Extract the confirmation link Continue the test in Selenium Why Not Automate Gmail UI With Selenium? Automating the Gmail UI means logging in, searching, clicking a message, and parsing content from a third-party interface that changes frequently. This leads to: Flaky...