When merging a branch into master, maybe I’m weird, but I would like to step through the changes and compare each change as it is “existing” to what is “proposed” to be merged in.
When I click in the menu: Source Control > Master > Merge from branch…, the sheet which appears shows code from the master branch on the left pane, and the branch I am merging from on the right pane, and a column of “shifty eye” left/right indicators, one for each change, between them. All of the shifty eye indicators are slid to the right, to indicate that the change is, by default, accepted, which is usually what I want, except that this makes the code in the left “master” branch pane already look exactly the same as the code in the right pane. Both panes are showing me the “proposed” code. I don’t need two views of the same code! In order to see the “existing” code, I need to (1) select a change (2) click the “do right” shifty eye control at the bottom of the sheet, to momentarily disable that change, then (3) if I like the change, re-enable that change by clicking the “do left” control. Repeat steps (1) - (3) for all changes. Arghhh. This seems like may too much work. At least if the shifty eye controls supported multiple selections, I could disable all changes en masse, eliminating steps (1) and (2). Is there an easier way to do this, or do we all do steps (1) - (3), or is my workflow wrong? Thank you, Jerry _______________________________________________ Do not post admin requests to the list. They will be ignored. Xcode-users mailing list ([email protected]) Help/Unsubscribe/Update your Subscription: https://lists.apple.com/mailman/options/xcode-users/archive%40mail-archive.com This email sent to [email protected]
