CODEWITHSUNDEEP
gitgithubmerge-conflict-resolutiongit-merge-conflict
Camilo160
Camilo160

Reputation: 101

Fixing conflict in Git

I am using Github for manipulating files through a branch, on the way I did not pull the changes from a tsv file from the master to my branch and I updated a file in this format that eliminated the work done by the master and appears like a new file. This is causing conflicts and avoiding the automatically merge. I want to know how can I solve this issue such that I can merge my files into the master branch with zero conflicts. Thanks.

Upvotes: 0

Views: 95

Answers (1)

Tim Biegeleisen
Tim Biegeleisen

Reputation: 522516

Assuming you want to just replace the specific TSV file which you accidentally modified with the version coming from the upstream, you may use:

git checkout origin/master -- path/to/some/file.tsv

This assumes that the branch on which you are working is master, and the file's path is path/to/some/file.tsv. You may change these values to match your actual setup.

Upvotes: 1

Related Questions