Skip to main content

GitHub Repo Collaboration Work on single project

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

To collaborate effectively with your friend on the same project, you should use Git branches to manage different lines of development. Here's a step-by-step procedure you can follow to streamline collaboration:

1. Create Separate Branches for Each Developer

Create a New Branch for Your Friend: On your local repository, create a new branch for your friend. For example if your friend name is kilvish , if you want to create a branch named kilvish, you would run:

make sure you would be on main branch already  


command-> 

git checkout -b kilvish

git push origin kilvish


2. Set Up Your Friend’s Environment( On your Friend's System ) 

at kilvish side  run -> 

Clone the Repository (if not already done): If your friend hasn’t cloned the repository yet, they should do so:

command -> 

git clone https://github.com/Vasu-Birla/your-repo.git   // your your main clone line 

Fetch All Branches: After cloning, your friend should fetch all branches:
command -> 
git fetch --all


Checkout the New Branch: Switch to the new branch:

git checkout kilvish


3. Work on Your Branches

  • For You: Continue working on your branch (e.g., main or feature-yourname) and push changes to GitHub as usual.

  • For Your Friend: Your friend will work on kilvish and push changes to GitHub.


4. Handling Merges

  1. Update Your Branch: Periodically, you and your friend should pull changes from the main branch (or whatever branch you are using as the base) into your feature branches to keep up-to-date. For example, if the base branch is main:

==============for your friend he need to  Time to Time when you want to other's work in your code ===

git checkout main
git pull origin main
git checkout kilvish
git merge main

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


Now the following commands for the Main Guy who is Already working on main branch or owner of git repo -> 

Summary of Commands

Here’s a concise summary of the commands you’ll use:


  • Update local main branch
git checkout main
git pull origin main

  • Fetch latest branches and changes:
git fetch origin
  • Merge kilvish branch into main:
git merge origin/kilvish
  • Resolve conflicts (if any), add, and commit:
git add resolved-file.txt
git commit -m "Resolved merge conflict between main and shivi"

  • Push the updated main branch:
git push origin main


Thank You . 

Comments

Post a Comment

Popular posts from this blog

Part 15- What is Repeater (Networking Devices)- Computer Networking- CCNA

Repeater  hello friends i am Vasu Birla and today i am starting new segment of CCNA computer networking  its a Networking Devices. we will discuss every important Devices used in networks. Repeater is a first networking devices. What is Repeater  Repeater is a device that receives signals and re-transmits by amplifying or regenerating signals. Repeater has two port one is for receive signals from previous network and second port is for retransmit signals to the next extended network. Two Port Repeater Repeater is a device which is used to Regenerate or replicate signal (Pichhe se aa rahe signal ko regenerate karke ya amplify karke aage strong signals bhej sakte he) Analog and digital both type of signals can be retransmitted by repeater. Here there is difference between regeneration and amplifying.  Amplification means , received signals will be amplified as it is , whether there are impurities in signals  and Regeneration means repeate...
Post a Comment
Read more

How to deploy NodeJS app on server with Apache2 and acess it with Server IP addresss - Node JS deploy project Live.

     hello friens , This is Vasu Birla , in previous post we have seen the deployement of NodeJS app on AWS instance server instance but AWS server is expensive than other servers . SO today we will use simple Ubuntu server for making Live out Project using Apache2 . At the end you will be abe to access your NodeJS app using server IP address from anywhere  .. 1.  Login to your server using SSH terminal . (in AWS part i already explained how to do this )     -> Open your putty in hostname put your server IP -      login with ssh username ->root and password     (if you dont have root username and pass ask your      provider or reset it from cpanel or hosting panel ) 2. after login - on terminal you can Put your project anywhere.     There are two ways to put your project folder on server location     (i) - > using Github - (very popular and easy to track your everyday code changes t...
Post a Comment
Read more