Git and Intellij Project Setup

If you are not interested to setup Git, then you can download the code from the GitHub project link.



If you are interested to setup Git, then download Git from Git Website and install it. 

Get Git repository link from GitHub.



Open Git Bash



Navigate to the location that you want your project to be copied to in Git Bash and type the command:

git clone <Git Repository link>

For example:

cd /d/projects/gitprojects/
git clone https://github.com/ajtechdeveloper/BasicDropwizard.git



Then import the project into Intellij by using either of the 2 options given below:

1. Import Project



2. Project from Existing Sources



In both cases, you will have to point to pom.xml and then click on OK and continue with Next button in the next few screens, select the JDK to be used and click on Finish 


     

Comments

  1. Khamaroddin Shaikh7 August 2018 at 21:28

    if there are two branches A and B
    A makes changes and push his changes on origin
    B makes changes
    then how to merge these changes ?

    ReplyDelete
    Replies
    1. Aj Tech Developer17 August 2018 at 10:03

      Hi @KhamarSir
      Use Git Bash and execute the following commands as per my instructions:
      First checkout BranchA and pull the latest code from origin:
      git checkout BranchA
      git pull origin BranchA
      Then checkout BranchB:
      git checkout BranchB
      git merge BranchA
      If there are conflicts in merge, it will be displayed. You will have to merge the changes manually on the conflicted files.
      git commit -m "Comments"
      git push origin BranchB

      Delete

Post a Comment

Popular Posts

Elasticsearch, Logstash, Kibana Tutorial: Load MySQL Data into Elasticsearch

Image
Elasticsearch, Logstash, Kibana Tutorial: Load MySQL Data into Elasticsearch Introduction           I was searching for a tutorial online on all the elements of the "Elastic Stack" (formerly the "ELK stack") and all I found was either a tutorial on Elasticsearch only or a tutorial on Logstash only or a tutorial on Kibana only or a data migrate tutorial using Logstash and Elaticsearch. Hence I came up with this tutorial which gives a comprehensive overview of all the elements in the Elastic Stack. The use case that I am using in this post is a data load from MySQL DB into Elasticsearch using Logstash and visualizing this data using Kibana. Elasticsearch         Elasticsearch is a distributed, RESTful search and analytics engine that is based on Apache Lucene . It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents. For more details on Elasticsearch, ...
Keep reading

Dropwizard MySQL Integration Tutorial

Image
Dropwizard MySQL Integration Tutorial Introduction         Dropwizard is one of the most popular and most used frameworks for building microservices. I am assuming that you have a Basic Knowledge of Dropwizard and have a Basic Dropwizard Application running in your machine. If not, please check my blog on Basic Dropwizard Application by going to the link:  Dropwizard Tutorial . In this tutorial, we will be integrating a Dropwizard Application with MySQL Database, which is a relational database, to perform CRUD operations. The same steps can be followed to connect to any other relational database. Requirements to Run the Application: Java Maven MySQL Database IDE of your choice MySQL Database should be setup and running in your machine. To setup, run and test if the MySQL Database is working fine, please refer to my post on: MySQL Database Setup . In this post, I am using a simple Employee Table to perform CRUD operations. Here is the s...
Keep reading

Send Email in Java

Image
Send Email in Java Introduction         Sending an email is one of the most important and most frequently used functionalities in a technology organization. A software developer should know how this is done. This post will give you a comprehensive overview of sending emails using Java mail libraries. This post will give you an overview of the following: Send a plain text email in HTML format. Create an attachment and send an email. Use an existing file as an attachment and send an email.  As RESTful web services are commonly used today, I will be using Dropwizard for building out the email functionality as RESTful APIs. Hence here are what I will be using in this post: Java mail libraries: To connect to email service provider, compose and send emails Gmail: Email service provider Dropwizard: For developing Email functionalities as RESTful web services         Dropwizard is one of the most popular and most used frameworks ...
Keep reading