#GITHUB DESKTOP MERGE CONFLICTS WINDOWS#

Switch to the Master branch and click on Branch =>Merge into the current branch. Push the changes to the remote repository. Make a change to a file in the feature branch and commit the same. Post this we should push the changes of the master and feature branch to GitHub.

We can merge the changes to the master branch. Merge Changes In Local RepositoryĪssume that there are changes in the feature branch in the local repository. Changes in the remote repository should also be in sync with the local repository. Now the changes can be made to the files locally and then push the changes to the remote repository. Click on Publish repository.Īs there is also a Feature branch, you must publish the feature branch as well. Now we do have 2 branches and we can proceed to Publish / Push the changes to GitHub. Call it to feature and click on Create branch. Click on Create Repository.Īs the repository is created, you can also create a branch before you publish/push the changes to GitHub. Using GitHub desktop, we can also create a new local repository and push or publish the same to GitHub.Įnter the name of the repository and the local path. In the previous section, we learned about working with the remote repository by cloning it. Now the local repository would be in sync with the remote repository. Proceed to create and merge the Pull Request and then finally pull(sync) the changes to your local repository.įrom the Repository, the menu selects the Pull option. You are then re-directed to GitHub to create the Pull Request. Switch to the feature branch and create a Pull Request.

To ensure that the changes are merged to the feature branch we will need to create a Pull Request. Now the changes are visible in the master branch. We can now push the changes to the remote repository in GitHub. You will notice that most of the git commands that you execute from the command prompt have been done through the user interface. Make changes to the files and save the same.īack in the GitHub Desktop, you can see the RED marking which specifies if the lines were added or were deleted.Īdd a Summary and Co-authors if needed and click on Commit to master at the bottom. Now as the repository is cloned to the local machine, we can open the local repository contents using command prompt or explorer or even Atom editor if installed and make changes to the files. Go to the URL tab and enter the remote repository details in the form of the GitHub Username/repository. In GitHub Desktop, to clone a repository select File => Clone Repository

In GitHub Desktop, go to File => Options and ensure your GitHub account is setup. Once the GitHub desktop is launched, we can start by cloning the remote repository to the local machine, make changes and push it back to the remote repository.

#GITHUB DESKTOP MERGE CONFLICTS WINDOWS#

GitHub Desktop for Windows can be downloaded and installed from the following URL Though the Git commands executed from the command line are great from a learning point of view, there is a good user interface to work on the local repositories i.e. Create A New Local Repository And Branch.

Github desktop merge conflicts