• Status: Solved
  • Priority: Medium
  • Security: Public
  • Views: 413
  • Last Modified:

How do i merge binary files in Git Repo ?

Hi Experts ,

We are in team working on project and new to git hub . When we push and pull our files often our dll files got changed and now shows as conflict error occurs . Is there any other idea for this case
0
karthik80c
Asked:
karthik80c
  • 4
  • 4
1 Solution
 
Anil GolamariCommented:
Hi,

When you say DLL files do you mean DLL's that were output of your local build or the libraries you are trying to reference and issue happens when someone tries to update the referenced libraries.?

If the first case my suggestions would be not to add libraries/DLL's (output of your local build) to Git repo. Any developer should be able to get the repo and build it local to get those libraries.

In the second case where you are referencing external libraries, it would be best to keep all of them in a lib folder and then reference from there so that next time if someone wants to update the existing then you will be able to minimize the issue of having references to multiple libraries from different locations.
0
 
karthik80cAuthor Commented:
Thanks Anil Golamari

Best suggestion . so how do i ignore those files to keep track from git hub and i tried with them and it snot working . Can u tell me proper way to ignore file tracking on git
0
 
Anil GolamariCommented:
You can actually add those all file extensions into a .gitignore file and then keep it on top folder of your repo. So that next time you try to build your application locally and try to check-in git can automatically ignore those files as check-in required files.  I have attached a file that I use in one of my projects. You should be able to use it and try to go through all the files extensions and see if you want to add or remove any existing filters.
gitignore.txt
1
Cloud Class® Course: Amazon Web Services - Basic

Are you thinking about creating an Amazon Web Services account for your business? Not sure where to start? In this course you’ll get an overview of the history of AWS and take a tour of their user interface.

 
karthik80cAuthor Commented:
Thanks buddy for ur help and i will add the ignore file and let u know
0
 
karthik80cAuthor Commented:
Git ignore text is not working on my repo
0
 
Anil GolamariCommented:
what is the file extension of the file you have for the git ignore file in your repo?
0
 
karthik80cAuthor Commented:
We need to ignore DLL files (.dll) and web.config file . I have tried to ignore those file with following code on git ignore . but whenever we build the file git add to the changed file

/bin/*
/web.config

Open in new window

0
 
Anil GolamariCommented:
Have you tried using the .gitignore file I have provided above?  The file which I send out earlier was supposed to filter libraries without any issue.  

Also, you can try
/[B]bin/*
/[W]web.config

Open in new window

1
Question has a verified solution.

Are you are experiencing a similar issue? Get a personalized answer when you ask a related question.

Have a better answer? Share it in a comment.

Join & Write a Comment

Featured Post

Free Tool: Path Explorer

An intuitive utility to help find the CSS path to UI elements on a webpage. These paths are used frequently in a variety of front-end development and QA automation tasks.

One of a set of tools we're offering as a way of saying thank you for being a part of the community.

  • 4
  • 4
Tackle projects and never again get stuck behind a technical roadblock.
Join Now