How to sync code between two git repositories? -
i have ios app both ipad version , iphone version. different in ui part.
currently 2 separate projects , managed respective git repositories. every time common code changed in 1 project, have copy code other project. causes bugs because of changed code not copied.
for single file, sample change history looks like:
- [in ipad project]change 1st line of file "a.txt", write in "ipad ui code"
- [in iphone project]change 1st line of file "a.txt", write in "iphone ui code"
- [in iphone project]change 2nd line of file "a.txt", write in "common code"
i want sync 2nd line "common code" between 2 projects. , keep difference in 1st line.
the file "a.txt" in iphone project should be:
ipad ui code common code
the file "a.txt" in iphone project should be:
iphone ui code common code
you can teach repository of solve conflict rerere merge can conflict , merge other diff conflict resolved merge done without conflict.
Comments
Post a Comment