GIT Commit Push Pull





Using Tortoise GIT

:sparkles: For Taking latest code from server
  • GIT Sync (It will open GIT sync UI)
    • Stash Save (it will save your changes to some temp folder)
    • Pull (It will get latest code into your repo)
    • Stash Pop (It will bring your changes back to your repo from the temp folder)
      While doing Stash Pop there may be conflict(:boom:) on some files which is committed by other users, that you need to resolve
    • Now you can start working on latest code

:sparkles: For Commit something
  • GIT Sync (It will open GIT sync UI)
    • Stash Save (it will save your changes to some temp folder)
    • Pull (It will get latest code into your repo)
    • Stash Pop (It will bring your changes back to your repo from the temp folder)
      While doing Stash Pop there may be conflict(:boom:) on some files which is committed by other users, that you need to resolve
    • Commit (It will Open the git commit UI, Select only those files that you want to commit and then do commit)
    • Push (It will push your commit to the server) (If you are getting any error(:boom:) like "git did not exit cleanly…" then, in that case do Fetch & Rebase )


Comments

  1. UnknownMay 16, 2016 at 6:50 AM

    It's helpful. Thanks. You can also follow me @https://uithought.wordpress.com/

    ReplyDelete

Post a Comment

Popular posts from this blog

Git Auto Increment tag

If you want GIT tag autoIncrement with one version number after each build you can use below shell script(./gittag.sh) as the hook. Scrip will find last committed TAG which starts with  ENV_TAG_PREFIX ( QA_V) and creates next release TAG then push tag to GIT. VERSION_MODE   [major|minor|revision|buildNumber - These are the possible value. each time one version is a tag with GIT. By default, buildNumber is pass which increment last digit in release tag like(x.x.x.1 to x.x.x.2). So if you want major release then you can pass major as option which tag GIT with major release  like (1.x.x.x to 2.x.x.x)] e.g. ./gittag.sh major       ./gittag.sh minor #!/bin/bash VERSION_MODE = $1 ENV_TAG_PREFIX = QA_V # "major": 1, # "minor": 0, # "revision": 0, # "buildNumber": 1 if [ "$VERSION_MODE" = "" ] ; then VERSION_MODE = "buildNumber" fi cd /path/to/your/git/checkout ...
Read more

Log rotate (catalina.out) of Tomcat

Rotate Catalina.out of tomcat on On Linux (Centos 7) server By default, Catalina.out file will not be rotated. To rotate it I have used logrotate. First, understand the  logrotate utility   Create tomcat file under /etc/logrotate.d/  using below command                               sudo vi /etc/logrotate.d/tomcat Press i to enable insert mode, past below script into file                                                                /opt/app/tomcat/logs/catalina.out {  su myuser myusergroup  missingok  notifempty  copytruncate  daily  size 5M  rotate 7 } Here /opt/app/tomcat/logs/catalina.out is path to your log file. press Esc key, then : wq!  to write and quite ...
Read more

Bypass SSL certificate check for Apache Axis2 client

For some reason, I wanted to totally ignore the certificate and trust store check with my Axis2 client stub implementations and I was looking for the solution. I came across a lot of articles which states about using  HttpsURLConnection to disable SSL check, but the problem is underlying Axis2 client doesn’t use the  HttpsURLConnection  Solution: We can use that TrustManager to create an SSLContext which trust all the servers. SSLContext sslCtx = SSLContext . getInstance ( "TLS" ); sslCtx . init ( null , new TrustManager [] { new TrustAllTrustManager ()}, null ); APIStub client = new APIStub ( url ); client . _getServiceClient (). getOptions (). setProperty ( HTTPConstants . CUSTOM_PROTOCOL_HANDLER , new Protocol ( "https" , (ProtocolSocketFactory) new SSLProtocolSocketFactory ( sslCtx ), 443 ));
Read more