Wednesday, 15 September 2021

git conflict issues

 


git merge issues resolved this 

git reset --hard HEAD

git fetch origin 

git reset --hard origin

issue is confilct beween smae page commit so

i forcefully deleted my code and taken from master

using above commnds git conflict 

git profile create


git








at
Labels:

No comments:

Post a Comment

Subscribe to: Post Comments (Atom)

Best UI

 

  • wrap text in excel
     if text length big make it next line shorcut is ALt+Enter or cilck on wrap text
  • interview Harsco(enviri)
     Points 1.complex page layouts and adherence to code standards. 2.primeNG pagination 3.ngcontent 4.ngdestory(memorylekage) 5.datatransfer wi...
  • Duplicate records find and delete
     Check duplicate count based on 3 columns combo select EMPID,FORMinfoID,FormName,Count(*) as counts from tbl_FilesMigrationLogs  group by Em...