Checkin Process

Checkin Process

======= =======

git status 

git add . (stage is nothing but saving a copy in my branch)

git commit -m "LZCTCPSCNT-645 and LZCTCPSCNT-1098 is fixed" 

git stash   (temporarily shelves (or stashes) changes you've made to your working copy) 

git checkout develop

git pull

git checkout bugfix/faizal-bugfixes

git rebase develop  (Git rebase and merge both integrate changes from one branch into another. Where they differ is how it's done. Git rebase moves a feature branch into a master. 

                     Git merge adds a new commit, preserving the history.)

 

Any Conflicts Appears:

   1. Resolve conflicts 

   2. Commit   - Git commit -m "merge the changes"

   3. Git rebase --continue

   4. Git push or git push --force

   

git push --force

git stash apply    (git stash temporarily shelves (or stashes) changes you've made to your working copy so you can work on something else,

                    and then come back and re-apply them later on.) 

Rebase steps

      Our Branch ( Front End Ui)

      git pull

      git push

Rebase branch name

git pull origin develop (branch)

Any Conflicts Appears:

          1. Resolve conflicts 

          2. Add the files

          3. Commit - Git commit -m "merge the changes"

    4. Git push or git push --force

    .

if its no conflict directly we can push