git pull vs git fetch and merge












https://longair.net/blog/2009/04/16/git-fetch-and-merge/

Comments

Post a Comment

Popular posts from this blog

How to include CSS, JS and Image in Liferay Portlet JSP

Image
In Init.jsp,  add the following plug-ins to enable CSS and JS to be loaded inside a portlet. <%-- CSS, JS --%> <link href="/o/contact-us-portlet/css/portlet-main.css" rel="stylesheet" /> <script src="/o/contact-us-portlet/js/portlet-main.js"></script> The path starting with /o/(portlet-name)/  is automatically appended to main url (ex. localhost:8080/o/..) /o/(portlet-name)/  represents resources/META-INF/resources One thing to keep in mind is that the above initialization should be done after <liferay-theme:defineObjects /> <portlet:defineObjects /> I DO NOT KNOW WHY ... In view.jsp. can get path through request src="<%=request.getContextPath()%>/images/form-icon.png" Prerequisite: In bnd.bnd Web-ContextPath: /contact-us-portlet  should be set . ------------------------------------------------------------------------- Today's trouble sh...
Read more

GoGo Shell & What can be deleted in Liferay Instance

In Liferay Instance, remove 'state' in osgi & 'work' in tomcat to remove all histories. GoGoShell is for checking the current state of each jar files in modules. pen cmd as admin and type 'telnet localhost 11311' lb : list all the jar files with state stop 70 (jar file numner) / start 70 (uninstall 70 but for deletion, it would be better to delete jar file from module folder physically) )
Read more