Committing same file to different forks. Will this cause problems?

In short, I am a designer on an engineering team that is working on multiple forks. I would like my team to always be using the latest iOS app icon, but I don't want to burden them by asking them to swap the art out every other day.

My first thought was that I should just clone all their forks, then commit the new artwork to each fork, but one of my co-workers thinks these identical files will cause a merge conflict when merging everything back in to main. Thoughts? Is there a better way to achieve this?

Answers


The proper way to do this would be to use a pull request for each of the forks. The commit that you are referencing will have a unique hash - the repository will know that it is the same commit in each fork.

https://help.github.com/articles/using-pull-requests


There will be no merge conflict when merging identical files. If the files are not exactly identical, for example if they differ by even a single bit, only then there will be a merge conflict. Try it, you can easily test this in two local branches.


Need Your Help

Odd spacing between SVG elements

html css svg

I have generated SVG elements using some basic javascript and string concatenation: http://jsfiddle.net/8d3zqLsf/3/

How to create custom PopupWindow from intent call?

android android-intent popupwindow

I wanna create a custom PopupWindow similar to this :

About UNIX Resources Network

Original, collect and organize Developers related documents, information and materials, contains jQuery, Html, CSS, MySQL, .NET, ASP.NET, SQL, objective-c, iPhone, Ruby on Rails, C, SQL Server, Ruby, Arrays, Regex, ASP.NET MVC, WPF, XML, Ajax, DataBase, and so on.