git:cherry－pick

Dependencies

Reference Version: BasePatch Set 1 PatchSet1
1a72b09d20941b68f585a07f70bbe40cc5784a21
Author yutao.wang
[email protected] 28, 2014 8:06 PM
Committer yutao.wang
[email protected] 2, 2014 7:32 PM
Parent(s) ad94588c6163fb8ab40086c0197ea116aa9068d8 upload zent source.
Download checkoutpullcherry-pickpatch
Anonymous HTTPSSHHTTP
git fetch ssh://[email protected]:29418/tz refs/changes/65/28765/1 && git cherry-pick FETCH_HEAD

ReviewCherry Pick ToAbandon ChangeRebase Change

~$  git cherry-pick f26e0ab8d4a0cc3bc42c0f10d6745c9b464c2e64

workspace/tz @wangyutao] $ git status

位于分支 master 您的分支与上游分支 ‘origin/master’ 一致。

您在执行拣选提交 f26e0ab 的操作。 （解决冲突并运行 “git cherry-pick –continue”） （使用 “git
cherry-pick –abort” 以取消拣选操作）

要提交的变更：

修改: tops-front/tops-front-purchaser/src/main/java/com/travelzen/tops/front/purchaser/flight/controller/FlightInternationalWhiteScreenSearchController.java
修改:tops-front/tops-front-purchaser/src/main/webapp/WEB-INF/page/internationalFlight/whiteScreenSearch/searchFieldNew.ftl
修改:tops-front/tops-front-purchaser/src/main/webapp/WEB-INF/page/internationalFlight/whiteScreenSearch/searchFilter.ftl
修改:tops-front/tops-front-purchaser/src/main/webapp/WEB-INF/page/internationalFlight/whiteScreenSearch/searchResultNew.ftl
修改:tops-front/tops-front-purchaser/src/main/webapp/WEB-INF/page/internationalFlight/whiteScreenSearch/tgqResult.ftl
修改:tops-front/tops-front-purchaser/src/main/webapp/WEB-INF/page/internationalFlight/whiteScreenSearch/whiteScreenToOrder.ft> 修改:tops-front/tops-front-purchaser/src/main/webapp/resources/javascripts/page/flight/internationalFlight/whiteScreenSearch.js

未合并的路径： （使用 “git add …” 标记解决方案）

双方修改： libraries.gradle

解冲突
[/workspace/tz @wangyutao] $ vim libraries.gradle

add：
[/workspace/tz @wangyutao] $ git add libraries.gradle 

提交：
[/workspace/tz @wangyutao] $ git commit 

请按 ENTER 或其它命令继续 [master 19a99e5] 国际白屏优化修改bug 7 files
changed, 119 insertions(+), 226 deletions(-) rewrite
tops-front/tops-front-purchaser/src/main/webapp/WEB-INF/page/internationalFlight/whiteScreenSearch/tgqResult.ftl
(81%)

push：
[/workspace/tz @wangyutao] $ git push origin HEAD:refs/for/master