Git

 Table of Contents

1. 
   GIT
   
2. 
   .gitignore
   
   1. 
      WordPress
      
3. 
   .gitconfig
   
4. 
   Git Workflows
   
   1. 
      Git Life Cycle
      
   2. 
      Git Workflows – Updated
      
      1. 
         Developing on Mac
         
   3. 
      Deploying to ROM Development (To be updated)
      
      1. 
         Start by pulling down the latest changes from master
         
      2. 
         Branch off to isolate the feature or bug-fix work in a branch
         
      3. 
         Now you can work on the feature
         
      4. 
         To keep your feature branch fresh and up to date with the latest changes in master, use rebase
         
      5. 
         When ready for feedback push your branch remotely and create a pull request
         
      6. 
         Perform a final rebase cleanup after the pull request has been approved
         
      7. 
         When development is complete record an explicit merge
         
      8. 
         a.   Merging into victord/production
         
      9. 
         b.  Testing
         
      10. 
          c.   Merging into master
          
      11. 
          Cleanup
          
      12. 
          Deploy
          
      13. 
          a.   Deploying into victord/production
          
      14. 
          b.  Deploying into master
          
   4. 
      Deploying to ROM Staging (To be updated)
      
   5. 
      Deploying to ROM WWW (To be updated)
      
   6. 
      Deploying to ROM Scratch (No longer needed)
      
   7. 
      Deploying to ROM Production (To be updated)
      
   8. 
      Phase1: Deploying to ROM Tickets Development
      
   9. 
      Phase2: Deploying to ROM Tickets Staging
      
   10. 
       Phase3: Deploying to ROM Tickets Production
       
5. 
   fatal: The remote end hung up unexpectedly
   
6. 
   Installing GIT latest version on CentOS
   
7. 
   Removing file from repo
   
8. 
   Changes not staged for commit
   
9. 
   remote: repository is in read only mode (over 2 GB size limit)
   
10. 
    pkg: PRE-INSTALL script failed
    
11. 
    Reverting single and multiple files
    
12. 
    git status shows typechange
    
13. 
    Git log
    
14. 
    Unable to git-ftp files to remote server
    
15. 
    Unable to git-ftp files to remote server (2)
    
16. 
    git ftp push -s production
    
17. 
    fatal: Could not upload files
    
18. 
    Checking difference between revisions
    
19. 
    Removing directories from repo
    
20. 
    Dealing with inconsistent repos between VM and Bitbucket
    
21. 
    Failed to push some refs
    
22. 
    Removing remote URLs
    
23. 
    Migrating an SVN repository with history to a new Git repository
    
24. 
    warning: you may want to set your diff.renameLimit variable to at least 5990 and retry the command
    
25. 
    error: pathspec ‘Initial import.’ did not match any file(s) known to git
    
26. 
    Moving directories inside the same Git repo – Restructuring
    
27. 
    Moving directories outside another Git repo – Exporting
    
28. 
    Moving .git directory into a subfolder
    
29. 
    fatal: .git/index: index file smaller than expected
    
30. 
    Enabling colors
    
31. 
    error: insufficient permission for adding an object to repository database .git/objects
    
32. 
    Merge vs Rebase
    
33. 
    Renaming Remote Git Repo, now what?
    
34. 
    Pushing my branch into the cloud (Bitbucket)
    
35. 
    Pushing my branch into the cloud (Bitbucket) fails
    
36. 
    error: unable to unlink old ‘[FILE]’: Permission denied
    
37. 
    Master is ahead
    
    1. 
       Git Merge
       
    2. 
       Git Rebase
       
38. 
    Fixing Git Conflicts
    
    1. 
       Solution for MacOS:
       
    2. 
       Solution for CentOS:
       
    3. 
       More Git Branching & Rebasing
       
       1. 
          Solution 1.
          
       2. 
          Solution 2.
          
       3. 
          Solution 3.
          
       4. 
          Solution 4. (non-cli)
          
       5. 
          Example 1
          
       6. 
          Example 2
          
       7. 
          Example 3
          
       8. 
          Example 1 (cont.)
          
       9. 
          Example 1 Summary
          
       10. 
           Example 2 (Not yet solved)
           
39. 
    Getting latest Git tag
    
40. 
    Getting latest Git commit
    
41. 
    Ignoring line breaks, EOL characters
    
42. 
    Git Status – Unseen message
    
43. 
    Git pull – Issues with Nano
    
44. 
    Reverting back to a previous commit
    
45. 
    Git branch behaves like ‘less’
    
46. 
    Updates were rejected because the tip of your current branch is behind
    
47. 
    Search for branches
    
48. 
    Losing your HEAD: HEAD detached
    
49. 
    Git Resolve
    
    1. 
       Similar Problem
       
50. 
    Git Pulling without specifying how to reconcile divergent branches is discouraged
    
51. 
    ROM Tickets – Git Workflows and CD/CI Pipelines
    
52. 
    Branch Development
    
    1. 
       A Special Case (1)
       
    2. 
       A Special Case (2)
       
    3. 
       A Special Case (3)
       
    4. 
       A Special Case (4)
       
    5. 
       A Special Case (5)
       
    6. 
       Summary of commands (TO BE REVIEWED)
       
53. 
    Git Pull Force
    
54. 
    Git Pull Warning
    
55. 
    Git Deletes Files
    
56. 
    Git Pull Errors (1)
    
57. 
    Changing a committed message
    
58. 
    Your branch and ‘origin/development’ have diverged
    
59. 
    Removing remote URLs for a branch
    
60. 
    Git Pull Errors (2)
    
61. 
    detected dubious ownership
    
62. 
    Deleting branches that have been merged to master
    
63. 
    Renaming branches
    
64. 
    Git Reset
    
65. 
    Rebasing – Altering Git History (1)
    
66. 
    Rebasing – Altering Git History (2)
    
67. 
    fatal: Need to specify how to reconcile divergent branches
    
68. 
    Main => Master
    
69. 
    Bitbucket
    
70. 
    ROM Bitbucket Auto Deployment (Completed. See T2.)
    
71. 
    Setting up an SSH key
    
    1. 
       Step 1. Set up your default identity
       
    2. 
       Step 2. Add the key to the ssh-agent
       
    3. 
       Step 3. (Mercurial only) Enable SSH compression
       
    4. 
       Step 4. Add the public key to your Bitbucket settings
       
72. 
    Setting Up Bitbucket Pipelines
    
    1. 
       Step 1: Add an SSH key in Bitbucket
       
    2. 
       Step 2: Update the known hosts (This step is unnecessary. See T14 below)
       
    3. 
       Step 3: Add the public key to a remote host
       
    4. 
       Step 4: Add the public key into the Bitbucket repo
       
73. 
    git ftp push -s production
    
74. 
    Permission denied (publickey)
    
75. 
    Pipeline gets stuck
    
76. 
    Pipeline gets stuck (2)
    
77. 
    Pipeline fails to execute git ftp init
    
78. 
    Creating Git repositories automatically on romlx16, upload to Bitbucket, and finally sftp back to romlx16
    
79. 
    Creating Git repositories automatically on MacOS, upload to Bitbucket, and finally sftp to remote VM
    
80. 
    git ftp push -s init fatal: Remote host not set
    
81. 
    git ftp init -s prod fatal: Can’t access remote
    
82. 
    curl: (60) SSL peer certificate or SSH remote key was not OK
    
83. 
    Re-introducing Pipeline
    
84. 
    Unable to add my hostname into Bitbucket
    
85. 
    curl: (1) Protocol “sftp” not supported or disabled in libcurl
    
86. 
    curl: (7) Failed to connect to 192.75.204.16 port 60: Connection refused
    
87. 
    Renaming Remote Git Repo, now what?
    
88. 
    Pushing my branch into the cloud (Bitbucket)
    
89. 
    Host key verification failed
    
90. 
    fatal: Could not read from remote repository.
    
91. 
    Bitbuket pipeline changes the owner and permission of files
    
92. 
    Dishan unable to git push
    
93. 
    INTERESTING!
    
94. 
    Cannot pull with rebase
    
95. 
    Connection timed out & Host key verification failed
    
96. 
    Disabling user accounts
    
97. 
    Pipeline failed – git config user.email commits-noreply@bitbucket.org
    
98. 
    Email notifications
    
99. 
    Pipeline failed
    
100. 
     Git Workflows and CD/CI Pipelines
     
101. 
     The authenticity of host ‘bitbucket.org (104.192.141.1)’ can’t be established
     
102. 
     GitHub
     
103. 
     GitHub Auto Deployment
     
     1. 
        GitHub Actions
        
104. 
     GitHub Desktop
     
105. 
     Actions.runner … Failed to execute command: Permission denied
     
106. 
     i/o timeout
     
107. 
     Your personal access token is about to expire
     
108. 
     Adding/Updating AWS Security Group for GitHub
     
109. 
     git@github.com: Permission denied (publickey)
     
110. 
     Resources