Collaboration with Git - Git Learning

A simulated team environment with a central bare repo and two developer clones for practicing push, pull, and merge conflicts.

README.md

Terminal Commands

Extract the downloaded ZIP file, open your terminal in the extracted folder, and try the following commands:

                                # Enter John's clone
                            
                                $
                                cd john
                            
                                # Try to push (will be rejected)
                            
                                $
                                git push origin main
                            
                                # Fetch and merge first
                            
                                $
                                git pull origin main
                            
                                # Resolve conflict then push
                            
                                $
                                git push origin main