Team collaboration - What should I do if someone needs the feature I wrote as a dependency in git flow?

For example, I am developing the feature/user user management module to provide the user's name, information, etc., and my colleague is developing the feature/login login system. He needs my user module to detect whether the user can log in, obtain user information, etc. Question 1: Assuming I've do...

伊谢尔伦 2017-05-02 09:28:14 0  3  885

Objective-c - Constraints for iOS a warning issue

1. Description: I customize a View, and the View and sub-controls inside are laid out using Masonry. When using it, first create this [[View alloc]init] and then add it to scrollView. After obtaining the data, calculate the size, and then set the frame of the View. 2. Question: The two sentences in ...

迷茫 2017-05-02 09:28:15 0  1  567

Confusion about using gitlab's fork&pull request mode within the team

As title. The company now uses gitlab, and the general usage process is as follows: 1. The boss creates a main warehouse mainrepo 2. Each member forks a copy of mainrepo 3. Develops in the code that has been forked by itself 4. After the development is completed, issue a merge request and wait Boss ...

滿天的星座 2017-05-02 09:28:16 0  4  821

Objective-c - In iOS development, Instagram cannot be authorized after logging in. Instagram does not jump back to the application. How to get the callback address?

In iOS development, Instagram cannot be authorized after logging in. Instagram does not jump back to the application. How to get the callback address?

習慣沉默 2017-05-02 09:28:17 0  0  717

Version Control - About the use of SVN and GIT in company projects?

The actual requirement is that there is a code now, and another colleague needs to expand and develop based on some functions of this code. Later, colleagues will gradually participate in the development of other modules. I would like to ask whether it is better to use SVN or GIT for multi-person co...

伊谢尔伦 2017-05-02 09:28:17 0  2  688

objective-c - socket sends data in xml format

1. Use GCDAsyncSocket to send a string in XML format. How to convert the XML string into NSData type and send it out?

为情所困 2017-05-02 09:28:18 0  0  553

github - How to keep Git multi-branch public classes up to date

For example, there is a general class A under the master branch of a project. I created a new branch dev for development (there are 2 branches locally, 1 is master and 1 is dev). The next day, the class A code of the master branch It has been updated and if I pull the dev branch, A is still the old ...

给我你的怀抱 2017-05-02 09:28:19 0  2  683

Objective-c - About static library conflict?

I encountered a problem when integrating the project. The error is that some attributes in the library are repeated? I wonder if it has something to do with setting -Objc -all_load in Other Linker Flags? What should I do if I want to modify these repeated attributes? thank you all

滿天的星座 2017-05-02 09:28:20 0  0  551

Files that have been added are ignored in git

Describe your problem. During the development process, some files were not ignored at the time and were added to git (configuration file config.php). Now they need to be deleted from git. Paste the relevant code $git rm --cached /config/config.php and paste the error message fatal: Could not s...

巴扎黑 2017-05-02 09:28:21 0  3  642

objective-c - iOS audio playback timer, how to access the remaining playback time even when the interface jumps, and where should the timer be stored?

If no timing is selected, the first one will be selected by default when it pops up for the first time. If a certain time is selected, the last selected cell will be displayed next time and the remaining time will be displayed.

大家讲道理 2017-05-02 09:28:23 0  0  494

github - Gighub Desktop git(origin/master) conflict, how to solve it

How to resolve conflicts?

过去多啦不再A梦 2017-05-02 09:28:24 0  2  925

objective-c - osx desktop program development, cocoa, NSScrllView includes NSStackView problem

I have an NSStackView, and the content is added at runtime. I hope that scroll bars will appear when the content exceeds a certain height, so I set an NSScrollView outside. Scroll bars can now appear, but there is a new problem. The new content of NSStackView is added from bottom to top. Excuse me, ...

曾经蜡笔没有小新 2017-05-02 09:28:25 0  2  776

github - Are gitbash and git shell command operations the same?

I would like to ask experienced seniors, I could not download github desktop from github, so I downloaded gitbash. Are the operations of gitbash and gitshell the same? Are all the command lines of the two consistent? Thanks!

某草草 2017-05-02 09:28:26 0  2  838

objective-c - How to get the file path when dragging a file under OS X

Drag the file to get the file path {code...} Get the URL, print 2016-08-01 17:11:21.201 DragAndDrop[3504:170407] file:///.file/id=6571367.14796550. Instead of a file path in the format of /Users/jolie/Downloads.

迷茫 2017-05-02 09:28:28 0  1  613

There are two Git repositories, the old and the new, can they be merged?

For example: Warehouse A: From version 1.0 -> 1.1 -> 2.0 Warehouse B: From version 2.0 -> 2.1 -> 2.2 Can warehouse A and B be merged to form 1.0 -> 1.1 -> A complete single repository for 2.0 -> 2.1 -> 2.2?

伊谢尔伦 2017-05-02 09:28:29 0  3  659

Objective-c - How to set up reception and deletion of WebView with Cookie?

{code...}

高洛峰 2017-05-02 09:28:30 0  0  417

What should I do if I can't upload via ssh connection to github in eclipse?

The project can be downloaded to the local area through ssh, and then I click upload: Then, I click OK: There is no prompt after confirmation, and then I go to github to see it, and I find that the upload is not successful. . . . What should I do?

淡淡烟草味 2017-05-02 09:28:32 0  1  588

objective-c - IOS-Error _OBJC_CLASS_$_ when integrating Aurora IM. . . . . . .

When I integrated a Jiguang SDK, I reported an error. I also added -ObjC and -all_load to the other linker flags. I checked the path and so on, and the header file could also be referenced. However, an error was reported as soon as I compiled it, both on the real machine and the simulator! Dear gods...

淡淡烟草味 2017-05-02 09:28:32 0  0  696

git status status shows UU

I submitted the code today and deployed it automatically. The result was that the merge failed. I logged on to the server and checked the status. The status of one file showed UU {code...}. I have never seen this status before. What does this letter represent? What does it mean?

滿天的星座 2017-05-02 09:28:34 0  1  1418

objective-c - Transition animation problem between iOS tableview and collection view?

Implemented in a view controller

阿神 2017-05-02 09:28:34 0  0  529