When you try to merge two branches, It does not require any PullRequest to do the task. Internal repository code merge can be done using local .
Even we can do the pull request using one the repository console link. But I may be end up with the conflict error. Be conscious on what you gonna do. You may not get option to resolve it on the online editor.
Need to know how to do, You have to follow this steps.
1) Go to repository location
2) Project1<REL-2.0.X> $ git pull
3) Project1<REL-2.0.X> $ git merge REL-1.7.X
4) Destination <-- Source
Source is 2.0 and destination 1.7 (Don't be confused with this repository versions).
Finally you will get the all source code changes on 1.7 version will be available on the 2.0.
If you done some mistake during this merge, follow this to revert.
(Get the merge commit version)
git revert -m 1 26a0837
git push
(Note : 1 is first parent, and 26a0837 is commit id.)
Monday, June 22, 2015
Thursday, April 23, 2015
intellij idea tips
If you are getting transformation from eclipse to idea user.
You may encounter this difficulties to find some of the project settings.
I will list out them here,
Enable project auto-import of sbt project
File --> settings --> (search for) SBT --> Enable auto import
[On the rigth side main pannel check the auto import]
You may encounter this difficulties to find some of the project settings.
I will list out them here,
Enable project auto-import of sbt project
File --> settings --> (search for) SBT --> Enable auto import
[On the rigth side main pannel check the auto import]
Some nice tips to talk with google
He understand keywords, But I some point they evolved with some more good features.
Let try this link,
http://www.google.com/insidesearch/tipstricks/all.html
[If is it not working working don't blame me]
Some of the finest ways that I would like are follows,
Search with in the site
ticket site:redbus.com
Search by filetype
filetype:ppt
Note : Google ignore punctuation, Don't waste your time there
there are more please find your self
Let try this link,
http://www.google.com/insidesearch/tipstricks/all.html
[If is it not working working don't blame me]
Some of the finest ways that I would like are follows,
Search with in the site
ticket site:redbus.com
Search by filetype
filetype:ppt
Find from phrase
"Use quote to search"
To avoid some word in search Use - sign
salsa recipe -tomatoes
Find related page or url
related: www.webupd8.com
Get definition
definition : computer
there are more please find your self
Wednesday, April 22, 2015
MongoDB NoSql
Key points to know about MongoDB
- It's a NoSQL database - In another way it is no RDBMS
- MongoDB does not use SQL as a query language , It uses java script syntactical way to query the db.It is not fully ACID-compliant
- Data stores as documents, into buckets
- Collection is the term to identify the buckets
- A document is a set of data , That Stored as BSON format (Binary JSON)
- Client feed the JSON input and db engine translate them as BSON.
- The process of data retrieval will transform the BSON to JSON.
- The manipulation of a document can be very easy.
- Fetched documents are ready to use on the web layer.
- Queries are in JSON style.
- Forming query is like taking with your friend with java notation.
- db.tablea.find() /* How easy know */
- [Note: Don't care about complex query now. Just park the thought and continue reading. Because we have option]
- You have media files to store , go and get GridFS.
- The actual strength is , highly scalable, massive performance, No need to maintain document structure (I love it).
Monday, October 20, 2014
Jira Search Hint
Custom search query in Jira.
text~"converted" Developer = currentUser() project = ProjectA assignee = currentUser() resolutiondate >=-3w ORDER BY updated DESC ## Finding current unresolved and assigned assignee = currentUser() AND resolution = Unresolved ORDER BY updatedDate DESC ## Finding resolved issue of the current user as developer Developer = currentUser() AND project = ProjectA AND resolutiondate >=-6w ORDER BY updated DESC ## With text search Developer = currentUser() AND project = ProjectA AND resolutiondate >=-6w AND text~"converted" ORDER BY updated DESC
Note : Edit based on your need
text~"converted" Developer = currentUser() project = ProjectA assignee = currentUser() resolutiondate >=-3w ORDER BY updated DESC ## Finding current unresolved and assigned assignee = currentUser() AND resolution = Unresolved ORDER BY updatedDate DESC ## Finding resolved issue of the current user as developer Developer = currentUser() AND project = ProjectA AND resolutiondate >=-6w ORDER BY updated DESC ## With text search Developer = currentUser() AND project = ProjectA AND resolutiondate >=-6w AND text~"converted" ORDER BY updated DESC
Note : Edit based on your need
Saturday, September 13, 2014
Liferay maven service builder
Create Liferay plugin project in the eclipse.
Note* : This will work if you installed the latest liferay IDE.
Select project as plugin project
Do the following steps once the project cretead successfuly.
mvn install -Dliferay.maven.plugin.version=6.2.0-RC5 -Dliferay.version=6.2.10-GA1
mvn clean -P build-service package -Dliferay.maven.plugin.version=6.2.0-RC5 -Dliferay.version=6.2.10-GA1
Sunday, June 29, 2014
Received Surprise in java tools
It was 6 months back : Some of my IT neighbors are trying to implement there CIT for all projects running in their office.
When I headed that news I surprised that "How good Idea that one tool will handle all your build process and reporting?". Then
I given my wish to them. Later I had situation to switch my life in another company. When I entered new office it was too much
surprises are waiting for me. All my environment for JAVA was changed except the one super guy "Eclipse". That was the only thing given me a super support. I was in a situation to learn all the new tools in a shot span of time. Gig(Bitbukket) / Egit for eclipse / Splunk / jRebel / Cloudbees / Amezon ec2 / jira / jenkins. !!! Ho! no ...
So I am trying to say tear your comfort zone. Then you will realize what you going to lean more.
Subscribe to:
Posts (Atom)
Merging two sorted arrays - Big O (n+m) time complexity
Problem : Merge the two sorted arrays. Edge case : Array can empty Arrays can be in different size let getMaxLength = ( input1 , input...
-
There was a sizeable crowd gathered in a temple to attend the festival. The wireless mic surprised me during the priest's talk when ever...
-
Ubuntu : I surprised after finding some data in my pen drive on ubuntu. I was copied folder prefixed of dot( "." [e.g] .m2) from ...
-
Elm Dict Package /elm-lang/core/1.0.0/Dict The Dict api is useful when situation comes to store key , pair value.It is Similar to Map /...