JIYIK CN >

This article will discuss how to push local changes to a remote repository and avoid merge conflicts by prioritizing changes.

We’ll cover everything you need to know about the git push command. Let’s get started!

git push command

We use the git push command to publish our local changes to the remote repository. The git push command is a mirror command of the git fetch command.

It exports our local changes to the remote repository instead of the git fetch command which imports the changes from the remote repository to our local repository.

Here are some common usage options:

1. git push The command will push our local changes from the specified local branch to the remote repository. If the branch does not exist in the remote repository, Git will create it and publish our commits.
2. git pushThe --force command will force a push to the remote repository, resulting in a non-fast-forward merge.
3. git pushThe --all command will push all our local branches to the remote repository.
4. git pushThe --tags command will push the tags in our local branch to the remote repository.

Force git push to overwrite files in the remote repository

Sometimes, Git will reject the command if the history of the remote repository does not match the history of the local repository git push. We can force our local revisions to the remote repository using the following command.

$ git push --force <remote> <branch>

Example:

$ git push --force origin master

If we don't include <remote>and <branch>, Git will push all local branches with the --set-upstream preset to the remote repository.

Alternatively, you can pull from the remote branch, merge the changes with your local repository, and then push again. This comes in handy when multiple developers share the same remote repository.

When conflicts occur in the shared commits, we can use git commit --amendthe fix command to fix them. After the fix, we can now push the merged changes back to the remote repository.

# Amend
git commit --amend
#Update Commit Message
git push --force origin master

Before we wrap up, let's briefly discuss how to delete a remote branch. This can be useful when we want to delete a specific branch in a remote repository.

We use the following command to delete the remote branch:

git branch -D <branch-name>
git push origin :branch-name