Clone the Forked Repository:

• Open a terminal or command prompt on your local machine.
• Use the git clone command to clone the forked repository to your local machine.

  bashCopy code
  git clone <forked-repository-url>
  

• Replace <forked-repository-url> with the actual URL of the forked repository. You can find this URL on the repository's page on GitHub.

Configure Upstream Remote:

• Change into the cloned repository's directory.

  bashCopy code
  cd <forked-repository-name>
  

• Add the original repository as the upstream remote.

  csharpCopy code
  git remote add upstream <original-repository-url>
  

• Replace <original-repository-url> with the actual URL of the original repository. This URL can also be found on the repository's page on GitHub.

Fetch the Latest Changes:

• Fetch the latest changes from both the origin (forked repository) and upstream (original repository) remotes.

  sqlCopy code
  git fetch origin
  git fetch upstream
  

Create a New Branch:

• Create a new branch to work on your changes.

  cssCopy code
  git checkout -b <branch-name>
  

• Replace <branch-name> with a descriptive name for your branch.

Make and Commit Your Changes:

• Make the necessary changes to the files in your local repository using your preferred editor or IDE.
• Stage the changes you want to commit.

  phpCopy code
  git add <file1> <file2> ...
  

• Replace <file1> <file2> ... with the names of the specific files you want to stage, or use . to stage all changes.
• Commit the changes.

  sqlCopy code
  git commit -m "Descriptive commit message"
  

Push Changes to Forked Repository:

• Push your branch with the changes to the forked repository.

  perlCopy code
  git push origin <branch-name>
  

Raise a Pull Request:

• Go to the forked repository on GitHub in your web browser.
• You should see a message prompting you to compare and pull request. Click on it.
• Review the changes you made and provide a descriptive title and comment for your pull request.
• Click on "Create pull request" to raise the pull request.

• This ensures that any changes to the main branch must go through a pull request and receive the necessary reviews before being merged.

Verify Remote Configuration:

• Ensure that you have added the upstream remote to your local repository. You can check your remote configuration using the following command:

  Copy code
  git remote -v
  

• It should display the upstream remote URL along with other remotes like origin.

Fetch Upstream Changes:

• Fetch the latest changes from the upstream remote using the following command:

  sqlCopy code
  git fetch upstream
  

• This command fetches the latest changes from the upstream repository without merging them into your local branch.

Switch to Your Branch:

• If you're not already on your branch, switch to it using the following command:

  phpCopy code
  git checkout <your-branch>
  

• Replace <your-branch> with the name of your branch.

Merge Upstream Changes:

• After fetching the upstream changes, you can merge them into your local branch using the following command:

  phpCopy code
  git merge upstream/<upstream-branch>
  

• Replace <upstream-branch> with the name of the upstream branch you want to merge.
• This command will incorporate the changes from the upstream branch into your local branch.

Resolve Conflicts (if any):

• If there are any conflicts between your local changes and the upstream changes, Git will notify you during the merge process.
• Open the conflicting files and resolve the conflicts manually by editing the files to contain the desired changes.
• After resolving the conflicts, stage the changes using git add <file> for each conflicted file.

Commit the Merge:

• Once all conflicts are resolved, commit the merge using the following command:

  sqlCopy code
  git commit -m "Merge upstream/<upstream-branch>"
  

• Add an appropriate commit message to describe the merge.

Verify Remote Configuration:

• Ensure that you have added the upstream remote to your local repository. You can check your remote configuration using the following command:

  Copy code
  git remote -v
  

• It should display the upstream remote URL along with other remotes like origin.

Switch to the Main Branch:

• If you're not already on the main branch, switch to it using the following command:

  cssCopy code
  git checkout main
  

• This command switches your current branch to the main branch.

Pull the Latest Changes:

• Before pushing your changes, it's recommended to pull the latest changes from the upstream dev branch to ensure you have the most up-to-date code.

  Copy code
  git pull upstream dev
  

• This command fetches and merges the latest changes from the upstream dev branch into your local main branch.

Push Changes to Upstream:

• Once you have the latest changes and are on the main branch, you can push your changes to the upstream dev branch using the following command:

  cssCopy code
  git push upstream main:dev
  

• This command pushes the commits from your local main branch to the upstream dev branch of the forked repository.