Solved

How do i merge binary files in Git Repo ?

Posted on 2016-11-07
8
31 Views
Last Modified: 2016-11-29
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
Comment
Question by:karthik80c
  • 4
  • 4
8 Comments
 
LVL 18

Expert Comment

by:Anil Golamari
ID: 41878894
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
 

Author Comment

by:karthik80c
ID: 41879918
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
 
LVL 18

Expert Comment

by:Anil Golamari
ID: 41880892
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
 

Author Comment

by:karthik80c
ID: 41881591
Thanks buddy for ur help and i will add the ignore file and let u know
0
How your wiki can always stay up-to-date

Quip doubles as a “living” wiki and a project management tool that evolves with your organization. As you finish projects in Quip, the work remains, easily accessible to all team members, new and old.
- Increase transparency
- Onboard new hires faster
- Access from mobile/offline

 

Author Comment

by:karthik80c
ID: 41885912
Git ignore text is not working on my repo
0
 
LVL 18

Expert Comment

by:Anil Golamari
ID: 41886309
what is the file extension of the file you have for the git ignore file in your repo?
0
 

Author Comment

by:karthik80c
ID: 41887357
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
 
LVL 18

Accepted Solution

by:
Anil Golamari earned 500 total points
ID: 41894150
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

Featured Post

How to run any project with ease

Manage projects of all sizes how you want. Great for personal to-do lists, project milestones, team priorities and launch plans.
- Combine task lists, docs, spreadsheets, and chat in one
- View and edit from mobile/offline
- Cut down on emails

Join & Write a Comment

To properly understand GitHub, let’s divide it into two words ‘Git’ and ‘Hub’. Git is basically a ‘Distribution Version Control’ (DVC) and ‘Source Code Management’ (SCM) system widely used by software programmers while Hub means the efficient centre…
A publishing tool, a Version Control System, or a Collaboration Platform! These can be some of the defining words for the two very famous web-hosting Git repositories: Bitbucket and Github. Git is widely used amongst the programmers and developers f…
How to commit changes, push them to a remote repository, and pull them from another location using the EGit plugin for Eclipse.
Explains the Git Index and the differences between a Remote, a Remote Tracking Branch, and a Local (or Tracking) branch.

707 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question

Need Help in Real-Time?

Connect with top rated Experts

15 Experts available now in Live!

Get 1:1 Help Now